Changeset 67246 in vbox

Timestamp:

Jun 2, 2017 3:16:34 PM (8 years ago)

Author:

vboxsync

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

115941

Message:

FE/Qt: Selector UI: Tools pane: Snapshot pane: Do not close details-widget when the Current State item is selected.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISnapshotDetailsWidget.cpp (modified) (15 diffs)
• UISnapshotDetailsWidget.h (modified) (3 diffs)
• UISnapshotPane.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotDetailsWidget.cpp

@@ -28 +28 @@
 # include <QPushButton>
 # include <QScrollArea>
+# include <QStackedLayout>
 # include <QTabWidget>
 # include <QTextEdit>
@@ -297 +298 @@
 UISnapshotDetailsWidget::UISnapshotDetailsWidget(QWidget *pParent /* = 0 */)
     : QIWithRetranslateUI<QWidget>(pParent)
+    , m_pStackedLayout(0)
+    , m_pEmptyWidget(0)
+    , m_pEmptyWidgetLabel(0)
     , m_pTabWidget(0)
     , m_pLayoutOptions(0)
@@ -360 +364 @@
 {
     /* Translate labels: */
+    m_pEmptyWidgetLabel->setText("<p>You have the <b>Current State</b> item selected.<br>"
+                                 "Press <b>Take</b> button if you wish to take a new snapshot.</p>");
     m_pTabWidget->setTabText(0, tr("&Attributes"));
     m_pTabWidget->setTabText(1, tr("D&etails"));
@@ -410 +416 @@
 void UISnapshotDetailsWidget::prepare()
 {
-    /* Create layout: */
-    new QVBoxLayout(this);
-    AssertPtrReturnVoid(layout());
-    {
-        /* Configure layout: */
-        layout()->setContentsMargins(0, 0, 0, 0);
-
+    /* Create stacked layout: */
+    m_pStackedLayout = new QStackedLayout(this);
+    AssertPtrReturnVoid(m_pStackedLayout);
+    {
+        /* Prepare empty-widget: */
+        prepareEmptyWidget();
         /* Prepare tab-widget: */
         prepareTabWidget();
+    }
+}
+
+void UISnapshotDetailsWidget::prepareEmptyWidget()
+{
+    /* Create empty-widget: */
+    m_pEmptyWidget = new QWidget;
+    AssertPtrReturnVoid(m_pEmptyWidget);
+    {
+        /* Create empty-widget layout: */
+        new QVBoxLayout(m_pEmptyWidget);
+        AssertPtrReturnVoid(m_pEmptyWidget->layout());
+        {
+            /* Create empty-widget label: */
+            m_pEmptyWidgetLabel = new QLabel;
+            {
+                /* Configure label: */
+                QFont font = m_pEmptyWidgetLabel->font();
+                font.setPointSize(font.pointSize() * 1.5);
+                m_pEmptyWidgetLabel->setAlignment(Qt::AlignCenter);
+                m_pEmptyWidgetLabel->setFont(font);
+
+                /* Add into layout: */
+                m_pEmptyWidget->layout()->addWidget(m_pEmptyWidgetLabel);
+            }
+        }
+
+        /* Add into layout: */
+        m_pStackedLayout->addWidget(m_pEmptyWidget);
     }
 }
@@ -434 +468 @@
 
         /* Add into layout: */
-        layout()->addWidget(m_pTabWidget);
+        m_pStackedLayout->addWidget(m_pTabWidget);
     }
 }
@@ -455 +489 @@
                 m_pLabelTaken->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
 
-                /* Add to layout: */
+                /* Add into layout: */
                 m_pLayoutOptions->addWidget(m_pLabelTaken, 0, 0);
             }
@@ -467 +501 @@
                 m_pLabelTakenText->setSizePolicy(policy);
 
-                /* Add to layout: */
+                /* Add into layout: */
                 m_pLayoutOptions->addWidget(m_pLabelTakenText, 0, 1);
             }
@@ -478 +512 @@
                 m_pLabelName->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
 
-                /* Add to layout: */
+                /* Add into layout: */
                 m_pLayoutOptions->addWidget(m_pLabelName, 1, 0);
             }
@@ -493 +527 @@
                         this, &UISnapshotDetailsWidget::sltHandleNameChange);
 
-                /* Add to layout: */
+                /* Add into layout: */
                 m_pLayoutOptions->addWidget(m_pEditorName, 1, 1);
             }
@@ -512 +546 @@
                 m_pLabelThumbnail->setPalette(pal);
 
-                /* Add to layout: */
+                /* Add into layout: */
                 m_pLayoutOptions->addWidget(m_pLabelThumbnail, 0, 2, 2, 1);
             }
@@ -523 +557 @@
                 m_pLabelDescription->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignTop);
 
-                /* Add to layout: */
+                /* Add into layout: */
                 m_pLayoutOptions->addWidget(m_pLabelDescription, 2, 0);
             }
@@ -540 +574 @@
                         this, &UISnapshotDetailsWidget::sltHandleDescriptionChange);
 
-                /* Add to layout: */
+                /* Add into layout: */
                 m_pLayoutOptions->addWidget(m_pBrowserDescription, 2, 1, 1, 2);
             }
@@ -603 +637 @@
                         QVariant(gpConverter->toIcon(enmType).pixmap(iconSize)));
 
-                /* Add to layout: */
+                /* Add into layout: */
                 m_pLayoutDetails->addWidget(m_pBrowserDetails);
             }
@@ -622 +656 @@
     if (m_comSnapshot.isNotNull())
     {
+        /* Choose the tab-widget as current one: */
+        m_pStackedLayout->setCurrentWidget(m_pTabWidget);
+
         /* Calculate snapshot timestamp info: */
         QDateTime timestamp;
@@ -681 +718 @@
     else
     {
+        /* Choose the empty-widget as current one: */
+        m_pStackedLayout->setCurrentWidget(m_pEmptyWidget);
+
         /* Clear snapshot timestamp info: */
         m_pLabelTakenText->clear();

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotDetailsWidget.h

@@ -32 +32 @@
 class QLabel;
 class QLineEdit;
+class QStackedLayout;
 class QTabWidget;
 class QTextEdit;
 class QVBoxLayout;
+class QWidget;
 
 
@@ -108 +110 @@
     /** Prepares all. */
     void prepare();
+    /** Prepares empty-widget. */
+    void prepareEmptyWidget();
     /** Prepares tab-widget. */
     void prepareTabWidget();
@@ -133 +137 @@
     /** Holds the cached screenshot. */
     QPixmap  m_pixmapScreenshot;
+
+    /** Holds the stacked layout instance. */
+    QStackedLayout *m_pStackedLayout;
+
+    /** Holds the empty-widget instance. */
+    QWidget *m_pEmptyWidget;
+    /** Holds the empty-widget label instance. */
+    QLabel  *m_pEmptyWidgetLabel;
 
     /** Holds the tab-widget instance. */

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

@@ -800 +800 @@
     );
     m_pActionShowSnapshotDetails->setEnabled(
-           m_pCurrentSnapshotItem
-        && pSnapshotItem
-        && !pSnapshotItem->isCurrentStateItem()
+        pSnapshotItem
     );
     m_pActionCommitSnapshotDetails->setEnabled(
@@ -814 +812 @@
 
     /* If there is a proper snasphot item: */
-    if (   m_pCurrentSnapshotItem
-        && pSnapshotItem
-        && !pSnapshotItem->isCurrentStateItem())
+    if (pSnapshotItem)
     {
         /* Update details-widget if it's visible: */
         if (m_pDetailsWidget->isVisible())
             m_pDetailsWidget->setData(*pSnapshotItem, pSnapshotItem->snapshot());
-    }
-    else
-    {
-        /* Clear details-widget if it's visible: */
-        if (m_pDetailsWidget->isVisible())
-            m_pDetailsWidget->clearData();
-        /* Toggle details button off and hide the widget: */
-        m_pActionShowSnapshotDetails->setChecked(false);
-        sltToggleSnapshotDetailsVisibility(false);
     }
 }
@@ -914 +901 @@
 
     /* If this is a snapshot item: */
-    if (   m_pCurrentSnapshotItem
-        && pSnapshotItem
-        && !pSnapshotItem->isCurrentStateItem())
+    if (pSnapshotItem)
     {
         /* Handle Ctrl+DoubleClick: */