Changeset 52236 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 30, 2014 2:11:22 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7462: Runtime UI: Menu-bar, menu cleanup/rework (part 13).

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIActionPoolRuntime.cpp (modified) (7 diffs)
• UIActionPoolRuntime.h (modified) (6 diffs)
• UIMachineLogic.cpp (modified) (3 diffs)
• UIMachineLogic.h (modified) (2 diffs)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (2 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (2 diffs)
• normal/UIMachineLogicNormal.cpp (modified) (1 diff)
• scale/UIMachineLogicScale.cpp (modified) (1 diff)
• seamless/UIMachineLogicSeamless.cpp (modified) (1 diff)

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

@@ -20 +20 @@
 #include "UIExtraDataManager.h"
 #include "UIShortcutPool.h"
+#include "UIFrameBuffer.h"
+#include "UISession.h"
 #include "VBoxGlobal.h"
 
@@ -1259 +1261 @@
 UIActionPoolRuntime::UIActionPoolRuntime(bool fTemporary /* = false */)
     : UIActionPool(UIActionPoolType_Runtime, fTemporary)
-{
+    , m_pSession(0)
+{
+}
+
+void UIActionPoolRuntime::setSession(UISession *pSession)
+{
+    m_pSession = pSession;
+    m_invalidations << UIActionIndexRT_M_View << UIActionIndexRT_M_ViewPopup;
+}
+
+UISession* UIActionPoolRuntime::session() const
+{
+    return m_pSession;
 }
 
@@ -1334 +1348 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-void UIActionPoolRuntime::setCurrentFrameBufferSizes(const QList<QSize> &sizes, bool fUpdateMenu /* = false */)
-{
-    m_sizes = sizes;
-    if (fUpdateMenu)
-        m_invalidations << UIActionIndexRT_M_View << UIActionIndexRT_M_ViewPopup;
-}
-
 void UIActionPoolRuntime::sltPrepareMenuViewResize()
 {
@@ -1360 +1367 @@
     const QSize size = pAction->property("Requested Size").toSize();
     emit sigNotifyAboutTriggeringViewResize(iScreenIndex, size);
+}
+
+void UIActionPoolRuntime::sltHandleFrameBufferResize()
+{
+    /* Make sure session was set: */
+    AssertPtrReturnVoid(m_pSession);
+
+    /* Update the list of frame-buffer sizes: */
+    m_frameBufferSizes.clear();
+    foreach (const UIFrameBuffer *pFrameBuffer, session()->frameBuffers())
+        m_frameBufferSizes << QSize(pFrameBuffer->width(), pFrameBuffer->height());
+    /* Invalidate View and ViewPopup menus: */
+    m_invalidations << UIActionIndexRT_M_View << UIActionIndexRT_M_ViewPopup;
 }
 
@@ -1915 +1935 @@
     const bool fAllowToShowActionResize = isAllowedInMenuView(RuntimeMenuViewActionType_Resize);
     if (fAllowToShowActionResize)
-        for (int iScreenIndex = 0; iScreenIndex < m_sizes.size(); ++iScreenIndex)
+        for (int iScreenIndex = 0; iScreenIndex < m_frameBufferSizes.size(); ++iScreenIndex)
         {
             /* Add 'Virtual Screen %1' menu: */
@@ -1967 +1987 @@
     const bool fAllowToShowActionResize = isAllowedInMenuView(RuntimeMenuViewActionType_Resize);
     if (fAllowToShowActionResize)
-        for (int iScreenIndex = 0; iScreenIndex < m_sizes.size(); ++iScreenIndex)
+        for (int iScreenIndex = 0; iScreenIndex < m_frameBufferSizes.size(); ++iScreenIndex)
         {
             /* Add 'Virtual Screen %1' menu: */
@@ -2026 +2046 @@
     /* Get corresponding screen index and size: */
     const int iScreenIndex = pMenu->property("Screen Index").toInt();
-    const QSize screenSize = m_sizes.at(iScreenIndex);
+    const QSize screenSize = m_frameBufferSizes.at(iScreenIndex);
 
     /* Create exclusive action-group: */

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

@@ -25 +25 @@
 #include "UIActionPool.h"
 #include "UIExtraDataDefs.h"
+
+/* Forward declarations: */
+class UISession;
 
 /** Runtime action-pool index enum.
@@ -122 +125 @@
 public:
 
+    /** Defines UI session object reference.
+      * @note For menus which uses it to build contents. */
+    void setSession(UISession *pSession);
+    /** Returns UI session object reference. */
+    UISession* session() const;
+
     /** Returns whether the menu with passed @a type is allowed in menu-bar. */
     bool isAllowedInMenuBar(RuntimeMenuType type) const;
@@ -149 +158 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-    /** Defines current frame-buffer sizes
-      * for menus which uses such arguments to build content. */
-    void setCurrentFrameBufferSizes(const QList<QSize> &sizes, bool fUpdateMenu = false);
-
 protected slots:
 
@@ -159 +164 @@
     /** Handles 'View' : 'Resize' menu @a pAction trigger. */
     void sltHandleActionTriggerViewResize(QAction *pAction);
+
+    /** Handles frame-buffer resize. */
+    void sltHandleFrameBufferResize();
 
 protected:
@@ -221 +229 @@
 private:
 
+    /** Holds the UI session object reference. */
+    UISession *m_pSession;
+
     /** Holds the list of main-menus. */
     QList<QMenu*> m_mainMenus;
@@ -237 +248 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 
-    /** Defines current frame-buffer sizes
-      * for menus which uses such arguments to build content. */
-    QList<QSize> m_sizes;
+    /** Holds current frame-buffer sizes. */
+    QList<QSize> m_frameBufferSizes;
 
     /* Enable factory in base-class: */

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

@@ -805 +805 @@
 
     /* Host-screen-change updaters: */
-    connect(uisession(), SIGNAL(sigHostScreenCountChanged()),
-            this, SLOT(sltHostScreenCountChanged()));
-    connect(uisession(), SIGNAL(sigHostScreenGeometryChanged()),
-            this, SLOT(sltHostScreenGeometryChanged()));
+    connect(uisession(), SIGNAL(sigHostScreenCountChanged()), this, SLOT(sltHostScreenCountChanged()));
+    connect(uisession(), SIGNAL(sigHostScreenGeometryChanged()), this, SLOT(sltHostScreenGeometryChanged()));
+
+    /* Frame-buffer connections: */
+    connect(this, SIGNAL(sigFrameBufferResize()), uisession(), SIGNAL(sigFrameBufferResize()));
 }
 
@@ -957 +958 @@
 }
 
-void UIMachineLogic::prepareOtherConnections()
-{
-    connect(this, SIGNAL(sigFrameBufferResize()), this, SLOT(sltHandleFrameBufferResize()));
-}
-
 void UIMachineLogic::prepareHandlers()
 {
@@ -1487 +1483 @@
 }
 
-void UIMachineLogic::sltHandleFrameBufferResize()
-{
-    /* Prepare the list of frame-buffer sizes: */
-    QList<QSize> frameBufferSizes;
-    foreach (UIMachineWindow *pMachineWindow, machineWindows())
-    {
-        const UIFrameBuffer *pFB = uisession()->frameBuffer(pMachineWindow->screenId());
-        frameBufferSizes << QSize(pFB->width(), pFB->height());
-    }
-    /* Pass that list to the action-pool to update 'View' menu accordingly: */
-    actionPool()->toRuntime()->setCurrentFrameBufferSizes(frameBufferSizes);
-}
-
 void UIMachineLogic::sltOpenVMSettingsDialog(const QString &strCategory /* = QString() */,
                                              const QString &strControl /* = QString()*/)

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

@@ -166 +166 @@
     virtual void prepareActionGroups();
     virtual void prepareActionConnections();
-    virtual void prepareOtherConnections();
+    virtual void prepareOtherConnections() {}
     virtual void prepareHandlers();
     virtual void prepareMachineWindows() = 0;
@@ -222 +222 @@
     void sltClose();
 
-    /** Handles frame-buffer resize. */
-    void sltHandleFrameBufferResize();
-
     /* "Device" menu functionality: */
     void sltOpenVMSettingsDialog(const QString &strCategory = QString(), const QString &strControl = QString());

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

@@ -985 +985 @@
     /* Create action-pool: */
     m_pActionPool = UIActionPool::create(UIActionPoolType_Runtime);
+    m_pActionPool->toRuntime()->setSession(this);
+    connect(this, SIGNAL(sigFrameBufferResize()), m_pActionPool, SLOT(sltHandleFrameBufferResize()));
 
     /* Get host/machine: */
@@ -1128 +1130 @@
 {
     /* Each framebuffer will be really prepared on first UIMachineView creation: */
-    const ULONG uMonitorCount = m_session.GetMachine().GetMonitorCount();
-    m_frameBufferVector.resize(uMonitorCount);
-    QVector<QSize> sizes(uMonitorCount);
-    actionPool()->toRuntime()->setCurrentFrameBufferSizes(sizes.toList(), true);
+    m_frameBufferVector.resize(m_session.GetMachine().GetMonitorCount());
 }
 

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

@@ -206 +206 @@
      * Ignores (asserts) if screen-number attribute is out of bounds: */
     void setFrameBuffer(ulong uScreenId, UIFrameBuffer* pFrameBuffer);
+    /** Returns existing frame-buffer vector. */
+    const QVector<ComObjPtr<UIFrameBuffer> >& frameBuffers() const { return m_frameBufferVector; }
 
     /* Temporary API: */
@@ -215 +217 @@
     /* Notifier: Close Runtime UI stuff: */
     void sigCloseRuntimeUI();
+
+    /** Notifies about frame-buffer resize. */
+    void sigFrameBufferResize();
 
     /* Console callback signals: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -477 +477 @@
 void UIMachineLogicFullscreen::prepareOtherConnections()
 {
-    /* Call to base-class: */
-    UIMachineLogic::prepareOtherConnections();
-
     /* Make sure 'presentation mode' preference handling
      * is updated at runtime for Lion and previous: */
@@ -517 +514 @@
         connect(pMachineWindow, SIGNAL(sigFrameBufferResize()),
                 this, SIGNAL(sigFrameBufferResize()));
+    emit sigFrameBufferResize();
 
     /* Connect multi-screen layout change handler: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp

@@ -177 +177 @@
         connect(pMachineWindow, SIGNAL(sigFrameBufferResize()),
                 this, SIGNAL(sigFrameBufferResize()));
+    emit sigFrameBufferResize();
 
     /* Mark machine-window(s) created: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp

@@ -130 +130 @@
         connect(pMachineWindow, SIGNAL(sigFrameBufferResize()),
                 this, SIGNAL(sigFrameBufferResize()));
+    emit sigFrameBufferResize();
 
     /* Mark machine-window(s) created: */

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

@@ -262 +262 @@
         connect(pMachineWindow, SIGNAL(sigFrameBufferResize()),
                 this, SIGNAL(sigFrameBufferResize()));
+    emit sigFrameBufferResize();
 
     /* Connect multi-screen layout change handler: */