Changeset 66951 in vbox

Timestamp:

May 18, 2017 2:32:20 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Mini-toolbar: A bit more wise release logging.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)
• widgets/UIMiniToolBar.cpp (modified) (9 diffs)
• widgets/UIMiniToolBar.h (modified) (2 diffs)

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

@@ -274 +274 @@
                                        GeometryType_Full,
                                        gEDataManager->miniToolbarAlignment(vboxGlobal().managedVMUuid()),
-                                       gEDataManager->autoHideMiniToolbar(vboxGlobal().managedVMUuid()));
+                                       gEDataManager->autoHideMiniToolbar(vboxGlobal().managedVMUuid()),
+                                       screenId());
     AssertPtrReturnVoid(m_pMiniToolBar);
     {

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

@@ -138 +138 @@
                                        GeometryType_Available,
                                        gEDataManager->miniToolbarAlignment(vboxGlobal().managedVMUuid()),
-                                       gEDataManager->autoHideMiniToolbar(vboxGlobal().managedVMUuid()));
+                                       gEDataManager->autoHideMiniToolbar(vboxGlobal().managedVMUuid()),
+                                       screenId());
     AssertPtrReturnVoid(m_pMiniToolBar);
     {

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

@@ -427 +427 @@
                              GeometryType geometryType,
                              Qt::Alignment alignment,
-                             bool fAutoHide /* = true */)
+                             bool fAutoHide /* = true */,
+                             int iWindowIndex /* = -1 */)
     : QWidget(0, defaultWindowFlags(geometryType))
     /* Variables: General stuff: */
@@ -434 +435 @@
     , m_alignment(alignment)
     , m_fAutoHide(fAutoHide)
+    , m_iWindowIndex(iWindowIndex)
     /* Variables: Contents stuff: */
     , m_pArea(0)
@@ -584 +586 @@
 void UIMiniToolBar::sltHide()
 {
-    LogRel2(("GUI: UIMiniToolBar::sltHide\n"));
+    LogRel(("GUI: Hide mini-toolbar for window #%d\n", m_iWindowIndex));
 
 #if defined(VBOX_WS_MAC)
@@ -610 +612 @@
 void UIMiniToolBar::sltShow()
 {
-    LogRel2(("GUI: UIMiniToolBar::sltShow\n"));
+    LogRel(("GUI: Show mini-toolbar for window #%d\n", m_iWindowIndex));
 
     /* Update transience: */
@@ -683 +685 @@
 void UIMiniToolBar::sltAdjust()
 {
-    LogRel2(("GUI: UIMiniToolBar::sltAdjust\n"));
+    LogRel(("GUI: Adjust mini-toolbar for window #%d\n", m_iWindowIndex));
 
     /* Get corresponding host-screen: */
@@ -709 +711 @@
             /* Set appropriate window size: */
             const QSize newSize = workingArea.size();
-            LogRel2(("GUI: UIMiniToolBar::sltAdjust: Resize window to: %dx%d\n",
-                     newSize.width(), newSize.height()));
+            LogRel(("GUI:  Resize mini-toolbar for window #%d to %dx%d\n",
+                     m_iWindowIndex, newSize.width(), newSize.height()));
             resize(newSize);
 
             /* Move window onto required screen: */
             const QPoint newPosition = workingArea.topLeft();
-            LogRel2(("GUI: UIMiniToolBar::sltAdjust: Move window to: %dx%d\n",
-                     newPosition.x(), newPosition.y()));
+            LogRel(("GUI:  Move mini-toolbar for window #%d to %dx%d\n",
+                     m_iWindowIndex, newPosition.x(), newPosition.y()));
             move(newPosition);
 
@@ -724 +726 @@
         {
             /* Map window onto required screen: */
-            LogRel2(("GUI: UIMiniToolBar::sltAdjust: Map window to screen: %d of: %d\n",
-                     iHostScreen, qApp->screens().size()));
+            LogRel(("GUI:  Map mini-toolbar for window #%d to screen %d of %d\n",
+                     m_iWindowIndex, iHostScreen, qApp->screens().size()));
             windowHandle()->setScreen(qApp->screens().at(iHostScreen));
 
             /* Set appropriate window size: */
             const QSize newSize = workingArea.size();
-            LogRel2(("GUI: UIMiniToolBar::sltAdjust: Resize window to: %dx%d\n",
-                     newSize.width(), newSize.height()));
+            LogRel(("GUI:  Resize mini-toolbar for window #%d to %dx%d\n",
+                     m_iWindowIndex, newSize.width(), newSize.height()));
             resize(newSize);
 
@@ -759 +761 @@
                 // host-screen. So we are resizing it to a smaller size first of all:
                 const QSize newSize = workingArea.size() * .9;
-                LogRel(("GUI: UIMiniToolBar::sltAdjust: Resize window to smaller size: %dx%d\n",
-                        newSize.width(), newSize.height()));
+                LogRel(("GUI:  Resize mini-toolbar for window #%d to smaller size %dx%d\n",
+                        m_iWindowIndex, newSize.width(), newSize.height()));
                 resize(newSize);
 
                 /* Move window onto required screen: */
                 const QPoint newPosition = workingArea.topLeft();
-                LogRel(("GUI: UIMiniToolBar::sltAdjust: Move window to: %dx%d\n",
-                        newPosition.x(), newPosition.y()));
+                LogRel(("GUI:  Move mini-toolbar for window #%d to %dx%d\n",
+                        m_iWindowIndex, newPosition.x(), newPosition.y()));
                 move(newPosition);
             }
@@ -785 +787 @@
             /* Set appropriate window size: */
             const QSize newSize = workingArea.size();
-            LogRel(("GUI: UIMiniToolBar::sltAdjust: Resize window to: %dx%d\n",
-                    newSize.width(), newSize.height()));
+            LogRel(("GUI:  Resize mini-toolbar for window #%d to %dx%d\n",
+                    m_iWindowIndex, newSize.width(), newSize.height()));
             resize(newSize);
 
             /* Move window onto required screen: */
             const QPoint newPosition = workingArea.topLeft();
-            LogRel(("GUI: UIMiniToolBar::sltAdjust: Move window to: %dx%d\n",
-                    newPosition.x(), newPosition.y()));
+            LogRel(("GUI:  Move mini-toolbar for window #%d to %dx%d\n",
+                    m_iWindowIndex, newPosition.x(), newPosition.y()));
             move(newPosition);
 

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

@@ -71 +71 @@
       * @param geometryType determines the geometry type,
       * @param alignment    determines the alignment type,
-      * @param fAutoHide    determines whether we should auto-hide. */
+      * @param fAutoHide    determines whether we should auto-hide.
+      * @param iWindowIndex determines the parent window index. */
     UIMiniToolBar(QWidget *pParent,
                   GeometryType geometryType,
                   Qt::Alignment alignment,
-                  bool fAutoHide = true);
+                  bool fAutoHide = true,
+                  int iWindowIndex = -1);
     /** Destructor. */
     ~UIMiniToolBar();
@@ -166 +168 @@
     /** Holds whether we should auto-hide. */
     bool m_fAutoHide;
+    /** Holds the parent window index. */
+    int m_iWindowIndex;
 
     /** Holds the area. */