Changeset 88409 in vbox

Timestamp:

Apr 8, 2021 9:46:27 AM (4 years ago)

Author:

vboxsync

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

143659

Message:

FE/Qt: bugref:6877: VirtualBox Manager: Snapshots pane: A bit of cleanup for prepare procedure; Snapshot details widget layout bug fix.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/snapshots

Files:

• UISnapshotPane.cpp (modified) (9 diffs)
• UISnapshotPane.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2020 Oracle Corporation
+ * Copyright (C) 2006-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -468 +468 @@
     , m_pIconSnapshotOnline(0)
     , m_pTimerUpdateAge(0)
+    , m_pLayoutMain(0)
     , m_pToolBar(0)
     , m_pSnapshotTree(0)
@@ -1188 +1189 @@
     /* Create timer: */
     m_pTimerUpdateAge = new QTimer;
-    AssertPtrReturnVoid(m_pTimerUpdateAge);
+    if (m_pTimerUpdateAge)
     {
         /* Configure timer: */
@@ -1256 +1257 @@
 {
     /* Create layout: */
-    new QVBoxLayout(this);
-    AssertPtrReturnVoid(layout());
+    m_pLayoutMain = new QVBoxLayout(this);
+    if (m_pLayoutMain)
     {
         /* Configure layout: */
-        layout()->setContentsMargins(0, 0, 0, 0);
+        m_pLayoutMain->setContentsMargins(0, 0, 0, 0);
 #ifdef VBOX_WS_MAC
-        layout()->setSpacing(10);
+        m_pLayoutMain->setSpacing(10);
 #else
-        layout()->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
+        m_pLayoutMain->setSpacing(qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing) / 2);
 #endif
 
@@ -1298 +1299 @@
 
         /* Add into layout: */
-        layout()->addWidget(m_pToolBar);
+        m_pLayoutMain->addWidget(m_pToolBar);
     }
 }
@@ -1306 +1307 @@
     /* Create snapshot tree: */
     m_pSnapshotTree = new UISnapshotTree(this);
-    AssertPtrReturnVoid(m_pSnapshotTree);
+    if (m_pSnapshotTree)
     {
         /* Configure tree: */
@@ -1319 +1320 @@
 
         /* Add into layout: */
-        layout()->addWidget(m_pSnapshotTree);
+        m_pLayoutMain->addWidget(m_pSnapshotTree, 1);
     }
 }
@@ -1326 +1327 @@
 {
     /* Create details-widget: */
-    m_pDetailsWidget = new UISnapshotDetailsWidget;
-    AssertPtrReturnVoid(m_pDetailsWidget);
+    m_pDetailsWidget = new UISnapshotDetailsWidget(this);
+    if (m_pDetailsWidget)
     {
         /* Configure details-widget: */
@@ -1335 +1336 @@
 
         /* Add into layout: */
-        layout()->addWidget(m_pDetailsWidget);
+        m_pLayoutMain->addWidget(m_pDetailsWidget, 1);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2020 Oracle Corporation
+ * Copyright (C) 2006-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -34 +34 @@
 class QTimer;
 class QTreeWidgetItem;
+class QVBoxLayout;
+class QIToolBar;
 class QITreeWidgetItem;
 class UIActionPool;
@@ -39 +41 @@
 class UISnapshotItem;
 class UISnapshotTree;
-class QIToolBar;
 
 
@@ -239 +240 @@
     /** @name Widget variables.
       * @{ */
+        /** Holds the main layout instance. */
+        QVBoxLayout *m_pLayoutMain;
+
         /** Holds the toolbar instance. */
         QIToolBar *m_pToolBar;