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

Timestamp:

Feb 26, 2013 1:13:46 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Multi-screen support: Cleanup multi-screen layout (part 1).

Location:

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

Files:

• UIMultiScreenLayout.cpp (modified) (5 diffs)
• UIMultiScreenLayout.h (modified) (2 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (3 diffs)
• seamless/UIMachineLogicSeamless.cpp (modified) (2 diffs)

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2010-2012 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43 +43 @@
     , m_pScreenMap(new QMap<int, int>())
 {
+    /* Calculate host/guest screen count: */
     CMachine machine = m_pMachineLogic->session().GetMachine();
     /* Get host/guest monitor count: */
@@ -63 +64 @@
 }
 
-void UIMultiScreenLayout::initialize(QMenu *pMenu)
+void UIMultiScreenLayout::setViewMenu(QMenu *pViewMenu)
 {
     if (m_cHostScreens > 1)
     {
-        pMenu->addSeparator();
+        pViewMenu->addSeparator();
         for (int i = 0; i < m_cGuestScreens; ++i)
         {
-            m_screenMenuList << pMenu->addMenu(tr("Virtual Screen %1").arg(i + 1));
+            m_screenMenuList << pViewMenu->addMenu(tr("Virtual Screen %1").arg(i + 1));
             m_screenMenuList.last()->menuAction()->setData(true);
             QActionGroup *pScreenGroup = new QActionGroup(m_screenMenuList.last());
@@ -175 +176 @@
 }
 
-int UIMultiScreenLayout::hostScreenForGuestScreen(int screenId) const
-{
-    return m_pScreenMap->value(screenId, 0);
+int UIMultiScreenLayout::hostScreenForGuestScreen(int iScreenId) const
+{
+    return m_pScreenMap->value(iScreenId, 0);
 }
 
@@ -271 +272 @@
     /* On success inform the observer. */
     if (fSuccess)
-        emit screenLayoutChanged();
+        emit sigScreenLayoutChanged();
 }
 

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #define __UIMultiScreenLayout_h__
 
-/* Global includes */
+/* Qt includes: */
 #include <QObject>
 
+/* Forward declarations: */
 class UIMachineLogic;
-
 class QMenu;
 class QAction;
 template <class Key, class T> class QMap;
 
+/* Multi-screen layout manager: */
 class UIMultiScreenLayout : public QObject
 {
     Q_OBJECT;
 
+signals:
+
+    /* Notifier: Layout change stuff: */
+    void sigScreenLayoutChanged();
+
 public:
+
+    /* Constructor/destructor: */
     UIMultiScreenLayout(UIMachineLogic *pMachineLogic);
     ~UIMultiScreenLayout();
 
-    void initialize(QMenu *pMenu);
+    /* API: View-menu stuff: */
+    void setViewMenu(QMenu *pViewMenu);
+
+    /* API: Update stuff: */
     void update();
+
+    /* API: Getters: */
     int hostScreenCount() const;
     int guestScreenCount() const;
-    int hostScreenForGuestScreen(int screenId) const;
+    int hostScreenForGuestScreen(int iScreenId) const;
     quint64 memoryRequirements() const;
     bool isHostTaskbarCovert() const;
 
-signals:
-    void screenLayoutChanged();
-
 private slots:
 
+    /* Handler: Screen change stuff: */
     void sltScreenLayoutChanged(QAction *pAction);
 
 private:
 
+    /* Other helpers: */
     quint64 memoryRequirements(const QMap<int, int> *pScreenLayout) const;
 
-    /* Private member vars */
+    /* Variables: */
     UIMachineLogic *m_pMachineLogic;
-
     int m_cGuestScreens;
     int m_cHostScreens;
-
     QMap<int, int> *m_pScreenMap;
     QList<QMenu*> m_screenMenuList;

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

@@ -128 +128 @@
     /* Add the view menu: */
     QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_View)->menu();
-    m_pScreenLayout->initialize(pMenu);
+    m_pScreenLayout->setViewMenu(pMenu);
     pMenu->setVisible(true);
 }
@@ -153 +153 @@
     /* Connect screen-layout change handler: */
     for (int i = 0; i < machineWindows().size(); ++i)
-        connect(m_pScreenLayout, SIGNAL(screenLayoutChanged()),
+        connect(m_pScreenLayout, SIGNAL(sigScreenLayoutChanged()),
                 static_cast<UIMachineWindowFullscreen*>(machineWindows()[i]), SLOT(sltPlaceOnScreen()));
 
@@ -159 +159 @@
     /* If the user change the screen, we have to decide again if the
      * presentation mode should be changed. */
-    connect(m_pScreenLayout, SIGNAL(screenLayoutChanged()),
+    connect(m_pScreenLayout, SIGNAL(sigScreenLayoutChanged()),
             this, SLOT(sltScreenLayoutChanged()));
     /* Note: Presentation mode has to be set *after* the windows are created. */

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

@@ -108 +108 @@
     /* Add the view menu: */
     QMenu *pMenu = gActionPool->action(UIActionIndexRuntime_Menu_View)->menu();
-    m_pScreenLayout->initialize(pMenu);
+    m_pScreenLayout->setViewMenu(pMenu);
     pMenu->setVisible(true);
 }
@@ -133 +133 @@
     /* Connect screen-layout change handler: */
     for (int i = 0; i < machineWindows().size(); ++i)
-        connect(m_pScreenLayout, SIGNAL(screenLayoutChanged()),
+        connect(m_pScreenLayout, SIGNAL(sigScreenLayoutChanged()),
                 static_cast<UIMachineWindowSeamless*>(machineWindows()[i]), SLOT(sltPlaceOnScreen()));