Changeset 67160 in vbox for trunk

Timestamp:

May 31, 2017 9:44:38 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: Tools pane: Snapshot pane: Rework details dialog to be widget similarly to Host Network Manager has.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VirtualBox2.qrc (modified) (1 diff)
• VirtualBox2_hidpi.qrc (modified) (1 diff)
• images/hidpi/snapshot_commit_details_16px_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/hidpi/snapshot_show_details_16px_hidpi.png )
• images/hidpi/snapshot_commit_details_22px_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/hidpi/snapshot_show_details_22px_hidpi.png )
• images/hidpi/snapshot_commit_details_disabled_16px_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/hidpi/snapshot_show_details_disabled_16px_hidpi.png )
• images/hidpi/snapshot_commit_details_disabled_22px_hidpi.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/hidpi/snapshot_show_details_disabled_22px_hidpi.png )
• images/snapshot_commit_details_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/snapshot_show_details_16px.png )
• images/snapshot_commit_details_22px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/snapshot_show_details_22px.png )
• images/snapshot_commit_details_disabled_16px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/snapshot_show_details_disabled_16px.png )
• images/snapshot_commit_details_disabled_22px.png (copied) (copied from trunk/src/VBox/Frontends/VirtualBox/images/snapshot_show_details_disabled_22px.png )
• src/VBoxSnapshotDetailsDlg.cpp (modified) (11 diffs)
• src/VBoxSnapshotDetailsDlg.h (modified) (6 diffs)
• src/VBoxSnapshotDetailsDlg.ui (modified) (2 diffs)
• src/selector/UISnapshotPane.cpp (modified) (17 diffs)
• src/selector/UISnapshotPane.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

@@ -136 +136 @@
         <file alias="site_oracle_16px.png">images/site_oracle_16px.png</file>
         <file alias="site_warning_16px.png">images/site_warning_16px.png</file>
+        <file alias="snapshot_commit_details_16px.png">images/snapshot_commit_details_16px.png</file>
+        <file alias="snapshot_commit_details_22px.png">images/snapshot_commit_details_22px.png</file>
+        <file alias="snapshot_commit_details_disabled_16px.png">images/snapshot_commit_details_disabled_16px.png</file>
+        <file alias="snapshot_commit_details_disabled_22px.png">images/snapshot_commit_details_disabled_22px.png</file>
         <file alias="snapshot_delete_16px.png">images/snapshot_delete_16px.png</file>
         <file alias="snapshot_delete_22px.png">images/snapshot_delete_22px.png</file>

trunk/src/VBox/Frontends/VirtualBox/VirtualBox2_hidpi.qrc

@@ -145 +145 @@
         <file alias="site_oracle_16px_hidpi.png">images/hidpi/site_oracle_16px_hidpi.png</file>
         <file alias="site_warning_16px_hidpi.png">images/hidpi/site_warning_16px_hidpi.png</file>
-        <file alias="snapshot_manager_16px_hidpi.png">images/hidpi/snapshot_manager_16px_hidpi.png</file>
-        <file alias="snapshot_manager_22px_hidpi.png">images/hidpi/snapshot_manager_22px_hidpi.png</file>
+        <file alias="snapshot_commit_details_16px_hidpi.png">images/hidpi/snapshot_commit_details_16px_hidpi.png</file>
+        <file alias="snapshot_commit_details_22px_hidpi.png">images/hidpi/snapshot_commit_details_22px_hidpi.png</file>
+        <file alias="snapshot_commit_details_disabled_16px_hidpi.png">images/hidpi/snapshot_commit_details_disabled_16px_hidpi.png</file>
+        <file alias="snapshot_commit_details_disabled_22px_hidpi.png">images/hidpi/snapshot_commit_details_disabled_22px_hidpi.png</file>
         <file alias="snapshot_delete_16px_hidpi.png">images/hidpi/snapshot_delete_16px_hidpi.png</file>
         <file alias="snapshot_delete_22px_hidpi.png">images/hidpi/snapshot_delete_22px_hidpi.png</file>
         <file alias="snapshot_delete_disabled_16px_hidpi.png">images/hidpi/snapshot_delete_disabled_16px_hidpi.png</file>
         <file alias="snapshot_delete_disabled_22px_hidpi.png">images/hidpi/snapshot_delete_disabled_22px_hidpi.png</file>
+        <file alias="snapshot_manager_16px_hidpi.png">images/hidpi/snapshot_manager_16px_hidpi.png</file>
+        <file alias="snapshot_manager_22px_hidpi.png">images/hidpi/snapshot_manager_22px_hidpi.png</file>
         <file alias="snapshot_offline_16px_hidpi.png">images/hidpi/snapshot_offline_16px_hidpi.png</file>
         <file alias="snapshot_online_16px_hidpi.png">images/hidpi/snapshot_online_16px_hidpi.png</file>

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - VBoxSnapshotDetailsDlg class implementation.
+ * VBox Qt GUI - UISnapshotDetailsWidget class implementation.
  */
 
@@ -256 +256 @@
 
 /*********************************************************************************************************************************
-*   Class VBoxSnapshotDetailsDlg implementation.                                                                                 *
+*   Class UISnapshotDetailsWidget implementation.                                                                                *
 *********************************************************************************************************************************/
 
-VBoxSnapshotDetailsDlg::VBoxSnapshotDetailsDlg(QWidget *pParent /* = 0 */)
-    : QIWithRetranslateUI<QDialog>(pParent)
+UISnapshotDetailsWidget::UISnapshotDetailsWidget(QWidget *pParent /* = 0 */)
+    : QIWithRetranslateUI<QWidget>(pParent)
 {
     /* Prepare: */
@@ -266 +266 @@
 }
 
-void VBoxSnapshotDetailsDlg::setData(const UIDataSnapshot &data, const CSnapshot &comSnapshot)
+void UISnapshotDetailsWidget::setData(const UIDataSnapshot &data, const CSnapshot &comSnapshot)
 {
     /* Cache old/new data: */
@@ -275 +275 @@
     m_comSnapshot = comSnapshot;
 
-    /* Load general snapshot properties: */
-    mLeName->setText(m_newData.m_strName);
-    mTeDescription->setText(m_newData.m_strDescription);
-
-    /* If there is really a snapshot: */
-    if (m_comSnapshot.isNotNull())
-    {
-        /* Calculate snapshot timestamp info: */
-        QDateTime timestamp;
-        timestamp.setTime_t(m_comSnapshot.GetTimeStamp() / 1000);
-        bool fDateTimeToday = timestamp.date() == QDate::currentDate();
-        QString dateTime = fDateTimeToday ? timestamp.time().toString(Qt::LocalDate) : timestamp.toString(Qt::LocalDate);
-        mTxTaken->setText(dateTime);
-
-        /* Read snapshot display contents: */
-        CMachine comMachine = m_comSnapshot.GetMachine();
-        ULONG iWidth = 0, iHeight = 0;
-
-        /* Get thumbnail if present: */
-        QVector<BYTE> thumbData = comMachine.ReadSavedThumbnailToArray(0, KBitmapFormat_BGR0, iWidth, iHeight);
-        m_pixmapThumbnail = thumbData.size() != 0 ? QPixmap::fromImage(QImage(thumbData.data(),
-                                                                              iWidth, iHeight,
-                                                                              QImage::Format_RGB32).copy())
-                                                  : QPixmap();
-
-        /* Get screenshot if present: */
-        QVector<BYTE> screenData = comMachine.ReadSavedScreenshotToArray(0, KBitmapFormat_PNG, iWidth, iHeight);
-        m_pixmapScreenshot = screenData.size() != 0 ? QPixmap::fromImage(QImage::fromData(screenData.data(),
-                                                                                          screenData.size(),
-                                                                                          "PNG"))
-                                                    : QPixmap();
-
-        // TODO: Check whether layout manipulations are really
-        //       necessary, they looks a bit dangerous to me..
-        QGridLayout *pLayout = qobject_cast<QGridLayout*>(layout());
-        AssertPtrReturnVoid(pLayout);
-        if (m_pixmapThumbnail.isNull())
-        {
-            pLayout->removeWidget(mLbThumbnail);
-            mLbThumbnail->setHidden(true);
-
-            pLayout->removeWidget(mLeName);
-            pLayout->removeWidget(mTxTaken);
-            pLayout->addWidget(mLeName, 0, 1, 1, 2);
-            pLayout->addWidget(mTxTaken, 1, 1, 1, 2);
-        }
-        else
-        {
-            pLayout->removeWidget(mLeName);
-            pLayout->removeWidget(mTxTaken);
-            pLayout->addWidget(mLeName, 0, 1);
-            pLayout->addWidget(mTxTaken, 1, 1);
-
-            pLayout->removeWidget(mLbThumbnail);
-            pLayout->addWidget(mLbThumbnail, 0, 2, 2, 1);
-            mLbThumbnail->setHidden(false);
-        }
-    }
-    else
-    {
-        /* Clear snapshot timestamp info: */
-        mTxTaken->clear();
-
-        // TODO: Check whether layout manipulations are really
-        //       necessary, they looks a bit dangerous to me..
-        QGridLayout *pLayout = qobject_cast<QGridLayout*>(layout());
-        AssertPtrReturnVoid(pLayout);
-        {
-            pLayout->removeWidget(mLbThumbnail);
-            mLbThumbnail->setHidden(true);
-
-            pLayout->removeWidget(mLeName);
-            pLayout->removeWidget(mTxTaken);
-            pLayout->addWidget(mLeName, 0, 1, 1, 2);
-            pLayout->addWidget(mTxTaken, 1, 1, 1, 2);
-        }
-    }
-
-    /* Retranslate: */
-    retranslateUi();
-}
-
-void VBoxSnapshotDetailsDlg::saveData()
-{
-    /* Make sure there is a snapshot: */
-    AssertReturnVoid(m_comSnapshot.isNotNull());
-
-    /* We need a session when we manipulate the snapshot data of a machine. */
-    CSession comSession = vboxGlobal().openExistingSession(m_comSnapshot.GetMachine().GetId());
-    if (comSession.isNull())
-        return;
-
-    /* Save snapshot name: */
-    m_comSnapshot.SetName(m_newData.m_strName);
-    /* Save snapshot description: */
-    m_comSnapshot.SetDescription(m_newData.m_strDescription);
-
-    /* Close the session again. */
-    comSession.UnlockMachine();
-}
-
-bool VBoxSnapshotDetailsDlg::eventFilter(QObject *pObject, QEvent *pEvent)
+    /* Load snapshot data: */
+    loadSnapshotData();
+}
+
+void UISnapshotDetailsWidget::clearData()
+{
+    /* Reset old/new data: */
+    m_oldData = UIDataSnapshot();
+    m_newData = m_oldData;
+
+    /* Reset snapshot: */
+    m_comSnapshot = CSnapshot();
+
+    /* Load snapshot data: */
+    loadSnapshotData();
+}
+
+bool UISnapshotDetailsWidget::eventFilter(QObject *pObject, QEvent *pEvent)
 {
     /* We have filter for thumbnail label only: */
@@ -394 +310 @@
 
     /* Call to base-class: */
-    return QDialog::eventFilter(pObject, pEvent);
-}
-
-void VBoxSnapshotDetailsDlg::retranslateUi()
+    return QWidget::eventFilter(pObject, pEvent);
+}
+
+void UISnapshotDetailsWidget::retranslateUi()
 {
     /* Translate uic generated strings: */
@@ -424 +340 @@
 }
 
-void VBoxSnapshotDetailsDlg::showEvent(QShowEvent *pEvent)
+void UISnapshotDetailsWidget::showEvent(QShowEvent *pEvent)
 {
     /* Call to base-class: */
-    QIWithRetranslateUI<QDialog>::showEvent(pEvent);
+    QIWithRetranslateUI<QWidget>::showEvent(pEvent);
 
     /* Make sure we should polish dialog: */
@@ -440 +356 @@
 }
 
-void VBoxSnapshotDetailsDlg::polishEvent(QShowEvent * /* pEvent */)
+void UISnapshotDetailsWidget::polishEvent(QShowEvent * /* pEvent */)
 {
     /* If we haven't assigned the thumbnail yet, do it now: */
@@ -453 +369 @@
 }
 
-void VBoxSnapshotDetailsDlg::sltHandleNameChange(const QString &strName)
-{
-    /* Recache snapshot name: */
-    m_newData.m_strName = strName;
-    /* Perform snapshot name sanity check: */
-    mButtonBox->button(QDialogButtonBox::Ok)->setEnabled(!strName.trimmed().isEmpty());
-}
-
-void VBoxSnapshotDetailsDlg::sltHandleDescriptionChange()
-{
-    /* Recache snapshot description: */
+void UISnapshotDetailsWidget::sltHandleNameChange()
+{
+    m_newData.m_strName = mLeName->text();
+    //revalidate(m_pErrorPaneName);
+    notify();
+}
+
+void UISnapshotDetailsWidget::sltHandleDescriptionChange()
+{
     m_newData.m_strDescription = mTeDescription->toPlainText();
-}
-
-void VBoxSnapshotDetailsDlg::prepare()
+    //revalidate(m_pErrorPaneName);
+    notify();
+}
+
+void UISnapshotDetailsWidget::prepare()
 {
     /* Apply UI decorations: */
@@ -479 +395 @@
             /* Configure editor: */
             connect(mLeName, &QLineEdit::textChanged,
-                    this, &VBoxSnapshotDetailsDlg::sltHandleNameChange);
+                    this, &UISnapshotDetailsWidget::sltHandleNameChange);
         }
 
@@ -487 +403 @@
             /* Configure editor: */
             connect(mTeDescription, &QTextEdit::textChanged,
-                    this, &VBoxSnapshotDetailsDlg::sltHandleDescriptionChange);
+                    this, &UISnapshotDetailsWidget::sltHandleDescriptionChange);
         }
 
@@ -508 +424 @@
 }
 
+void UISnapshotDetailsWidget::loadSnapshotData()
+{
+    /* Read general snapshot properties: */
+    mLeName->setText(m_newData.m_strName);
+    mTeDescription->setText(m_newData.m_strDescription);
+
+    /* If there is a snapshot: */
+    if (m_comSnapshot.isNotNull())
+    {
+        /* Calculate snapshot timestamp info: */
+        QDateTime timestamp;
+        timestamp.setTime_t(m_comSnapshot.GetTimeStamp() / 1000);
+        bool fDateTimeToday = timestamp.date() == QDate::currentDate();
+        QString dateTime = fDateTimeToday ? timestamp.time().toString(Qt::LocalDate) : timestamp.toString(Qt::LocalDate);
+        mTxTaken->setText(dateTime);
+
+        /* Read snapshot display contents: */
+        CMachine comMachine = m_comSnapshot.GetMachine();
+        ULONG iWidth = 0, iHeight = 0;
+
+        /* Get thumbnail if present: */
+        QVector<BYTE> thumbData = comMachine.ReadSavedThumbnailToArray(0, KBitmapFormat_BGR0, iWidth, iHeight);
+        m_pixmapThumbnail = thumbData.size() != 0 ? QPixmap::fromImage(QImage(thumbData.data(),
+                                                                              iWidth, iHeight,
+                                                                              QImage::Format_RGB32).copy())
+                                                  : QPixmap();
+
+        /* Get screenshot if present: */
+        QVector<BYTE> screenData = comMachine.ReadSavedScreenshotToArray(0, KBitmapFormat_PNG, iWidth, iHeight);
+        m_pixmapScreenshot = screenData.size() != 0 ? QPixmap::fromImage(QImage::fromData(screenData.data(),
+                                                                                          screenData.size(),
+                                                                                          "PNG"))
+                                                    : QPixmap();
+
+        // TODO: Check whether layout manipulations are really
+        //       necessary, they looks a bit dangerous to me..
+        QGridLayout *pLayout = qobject_cast<QGridLayout*>(layout());
+        AssertPtrReturnVoid(pLayout);
+        if (m_pixmapThumbnail.isNull())
+        {
+            pLayout->removeWidget(mLbThumbnail);
+            mLbThumbnail->setHidden(true);
+
+            pLayout->removeWidget(mLeName);
+            pLayout->removeWidget(mTxTaken);
+            pLayout->addWidget(mLeName, 0, 1, 1, 2);
+            pLayout->addWidget(mTxTaken, 1, 1, 1, 2);
+        }
+        else
+        {
+            pLayout->removeWidget(mLeName);
+            pLayout->removeWidget(mTxTaken);
+            pLayout->addWidget(mLeName, 0, 1);
+            pLayout->addWidget(mTxTaken, 1, 1);
+
+            pLayout->removeWidget(mLbThumbnail);
+            pLayout->addWidget(mLbThumbnail, 0, 2, 2, 1);
+            mLbThumbnail->setHidden(false);
+        }
+    }
+    else
+    {
+        /* Clear snapshot timestamp info: */
+        mTxTaken->clear();
+
+        // TODO: Check whether layout manipulations are really
+        //       necessary, they looks a bit dangerous to me..
+        QGridLayout *pLayout = qobject_cast<QGridLayout*>(layout());
+        AssertPtrReturnVoid(pLayout);
+        {
+            pLayout->removeWidget(mLbThumbnail);
+            mLbThumbnail->setHidden(true);
+
+            pLayout->removeWidget(mLeName);
+            pLayout->removeWidget(mTxTaken);
+            pLayout->addWidget(mLeName, 0, 1, 1, 2);
+            pLayout->addWidget(mTxTaken, 1, 1, 1, 2);
+        }
+    }
+
+    /* Retranslate: */
+    retranslateUi();
+}
+
+void UISnapshotDetailsWidget::notify()
+{
+//    if (m_oldData != m_newData)
+//        printf("Snapshot: %s, %s\n",
+//               m_newData.m_strName.toUtf8().constData(),
+//               m_newData.m_strDescription.toUtf8().constData());
+
+    emit sigDataChanged(m_oldData != m_newData);
+}
+
 #include "VBoxSnapshotDetailsDlg.moc"
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - VBoxSnapshotDetailsDlg class declaration.
+ * VBox Qt GUI - UISnapshotDetailsWidget class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef ___VBoxSnapshotDetailsDlg_h___
-#define ___VBoxSnapshotDetailsDlg_h___
+#ifndef ___UISnapshotDetailsWidget_h___
+#define ___UISnapshotDetailsWidget_h___
 
 /* GUI includes: */
@@ -57 +57 @@
 
 
-/** QDialog extension providing GUI with snapshot details dialog. */
-class VBoxSnapshotDetailsDlg : public QIWithRetranslateUI<QDialog>, public Ui::VBoxSnapshotDetailsDlg
+/** QWidget extension providing GUI with snapshot details-widget. */
+class UISnapshotDetailsWidget : public QIWithRetranslateUI<QWidget>, public Ui::VBoxSnapshotDetailsDlg
 {
     Q_OBJECT;
 
+signals:
+
+    /** Notifies listeners about data changed and whether it @a fDiffers. */
+    void sigDataChanged(bool fDiffers);
+
 public:
 
-    /** Constructs snapshot details dialog passing @a pParent to the base-class. */
-    VBoxSnapshotDetailsDlg(QWidget *pParent = 0);
+    /** Constructs snapshot details-widget passing @a pParent to the base-class. */
+    UISnapshotDetailsWidget(QWidget *pParent = 0);
 
+    /** Returns the snapshot data. */
+    const UIDataSnapshot &data() const { return m_newData; }
     /** Defines the snapshot @a data. */
     void setData(const UIDataSnapshot &data, const CSnapshot &comSnapshot);
-    /** Saves the snapshot data. */
-    void saveData();
+    /** Clears the snapshot data. */
+    void clearData();
 
 protected:
@@ -87 +94 @@
 private slots:
 
-    /** Handles snapshot @a strName change. */
-    void sltHandleNameChange(const QString &strName);
+    /** Handles snapshot name change. */
+    void sltHandleNameChange();
     /** Handles snapshot description change. */
     void sltHandleDescriptionChange();
@@ -96 +103 @@
     /** Prepares all. */
     void prepare();
+
+    /** Loads snapshot data. */
+    void loadSnapshotData();
+
+    /** Notifies listeners about data changed or not. */
+    void notify();
 
     /** Holds whether this widget was polished. */
@@ -114 +127 @@
 };
 
-#endif /* !___VBoxSnapshotDetailsDlg_h___ */
+#endif /* !___UISnapshotDetailsWidget_h___ */
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.ui

@@ -14 +14 @@
  </comment>
  <class>VBoxSnapshotDetailsDlg</class>
- <widget class="QDialog" name="VBoxSnapshotDetailsDlg">
+ <widget class="QWidget" name="VBoxSnapshotDetailsDlg">
   <property name="geometry">
    <rect>
@@ -147 +147 @@
     </widget>
    </item>
-   <item row="4" column="0" colspan="3">
-    <widget class="QIDialogButtonBox" name="mButtonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QIDialogButtonBox</class>
-   <extends>QDialogButtonBox</extends>
-   <header>QIDialogButtonBox.h</header>
-  </customwidget>
- </customwidgets>
  <resources>
   <include location="../VirtualBox1.qrc"/>
  </resources>
- <connections>
-  <connection>
-   <sender>mButtonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>VBoxSnapshotDetailsDlg</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>203</x>
-     <y>365</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>203</x>
-     <y>193</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>mButtonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>VBoxSnapshotDetailsDlg</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>203</x>
-     <y>365</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>203</x>
-     <y>193</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
 </ui>

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

@@ -531 +531 @@
     , m_pActionRestoreSnapshot(0)
     , m_pActionShowSnapshotDetails(0)
+    , m_pActionCommitSnapshotDetails(0)
     , m_pActionCloneSnapshot(0)
     , m_pSnapshotTree(0)
     , m_pCurrentSnapshotItem(0)
+    , m_pDetailsWidget(0)
 {
     /* Prepare: */
@@ -583 +585 @@
     m_pActionRestoreSnapshot->setText(tr("&Restore"));
     m_pActionShowSnapshotDetails->setText(tr("D&etails..."));
+    m_pActionCommitSnapshotDetails->setText(tr("&Apply..."));
     m_pActionCloneSnapshot->setText(tr("&Clone..."));
     /* Translate actions tool-tips: */
@@ -591 +594 @@
     m_pActionRestoreSnapshot->setToolTip(tr("Restore Snapshot (%1)")
                                          .arg(m_pActionRestoreSnapshot->shortcut().toString()));
-    m_pActionShowSnapshotDetails->setToolTip(tr("Show Snapshot Details (%1)")
+    m_pActionShowSnapshotDetails->setToolTip(tr("Open Snapshot Details (%1)")
                                              .arg(m_pActionShowSnapshotDetails->shortcut().toString()));
+    m_pActionCommitSnapshotDetails->setToolTip(tr("Apply Changes in Snapshot Details (%1)")
+                                               .arg(m_pActionCommitSnapshotDetails->shortcut().toString()));
     m_pActionCloneSnapshot->setToolTip(tr("Clone Virtual Machine (%1)")
                                        .arg(m_pActionCloneSnapshot->shortcut().toString()));
@@ -599 +604 @@
     m_pActionDeleteSnapshot->setStatusTip(tr("Delete selected snapshot of the virtual machine"));
     m_pActionRestoreSnapshot->setStatusTip(tr("Restore selected snapshot of the virtual machine"));
-    m_pActionShowSnapshotDetails->setStatusTip(tr("Display a window with selected snapshot details"));
+    m_pActionShowSnapshotDetails->setStatusTip(tr("Open pane with the selected snapshot details"));
+    m_pActionCommitSnapshotDetails->setStatusTip(tr("Apply changes in snapshot details pane"));
     m_pActionCloneSnapshot->setStatusTip(tr("Clone selected virtual machine"));
 
@@ -677 +683 @@
 }
 
+void UISnapshotPane::sltToggleSnapshotDetailsVisibility(bool fVisible)
+{
+    /* Show/hide commit action and details-widget: */
+    m_pActionCommitSnapshotDetails->setVisible(fVisible);
+    m_pDetailsWidget->setVisible(fVisible);
+    /* If details-widget is visible: */
+    if (m_pDetailsWidget->isVisible())
+    {
+        /* Acquire current snapshot item: */
+        const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
+        /* Update details-widget: */
+        m_pDetailsWidget->setData(*pSnapshotItem, pSnapshotItem->snapshot());
+    }
+}
+
+void UISnapshotPane::sltCommitSnapshotDetailsChanges()
+{
+    /* Make sure nothing being edited in the meantime: */
+    if (!m_pLockReadWrite->tryLockForWrite())
+        return;
+
+    /* Disable button first of all: */
+    m_pActionCommitSnapshotDetails->setEnabled(false);
+
+    /* Acquire current snapshot item: */
+    const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
+    AssertPtr(pSnapshotItem);
+    if (pSnapshotItem)
+    {
+        /* Make sure that's a snapshot item indeed: */
+        CSnapshot comSnapshot = pSnapshotItem->snapshot();
+        if (comSnapshot.isNotNull())
+        {
+            /* Get item data: */
+            UIDataSnapshot oldData = *pSnapshotItem;
+            UIDataSnapshot newData = m_pDetailsWidget->data();
+
+            /* Update corresponding snapshot attributes if necessary: */
+            if (newData != oldData)
+            {
+                /* We need to open a session when we manipulate the snapshot data of a machine: */
+                CSession comSession = vboxGlobal().openExistingSession(comSnapshot.GetMachine().GetId());
+                if (!comSession.isNull())
+                {
+                    // TODO: Add settings save validation.
+
+                    /* Save snapshot name: */
+                    if (newData.m_strName != oldData.m_strName)
+                        comSnapshot.SetName(newData.m_strName);
+                    /* Save snapshot description: */
+                    if (newData.m_strDescription != oldData.m_strDescription)
+                        comSnapshot.SetDescription(newData.m_strDescription);
+
+                    /* Close the session again: */
+                    comSession.UnlockMachine();
+                }
+            }
+        }
+    }
+
+    /* Allows editing again: */
+    m_pLockReadWrite->unlock();
+}
+
 void UISnapshotPane::sltHandleCurrentItemChange()
 {
-    /* Acquire corresponding snapshot item: */
+    /* Acquire current snapshot item: */
     const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
 
@@ -734 +804 @@
         && !pSnapshotItem->isCurrentStateItem()
     );
+    m_pActionCommitSnapshotDetails->setEnabled(
+        false
+    );
     m_pActionCloneSnapshot->setEnabled(
            pSnapshotItem
@@ -739 +812 @@
             || !fBusy)
     );
+
+    /* If there is a proper snasphot item: */
+    if (   m_pCurrentSnapshotItem
+        && pSnapshotItem
+        && !pSnapshotItem->isCurrentStateItem())
+    {
+        /* 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);
+    }
 }
 
@@ -761 +853 @@
         menu.addAction(m_pActionRestoreSnapshot);
         menu.addAction(m_pActionShowSnapshotDetails);
+        menu.addAction(m_pActionCommitSnapshotDetails);
         menu.addSeparator();
         menu.addAction(m_pActionCloneSnapshot);
@@ -784 +877 @@
     /* Acquire corresponding snapshot item: */
     const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(pItem);
-    AssertReturnVoid(pSnapshotItem);
-
-    /* Rename corresponding snapshot: */
-    CSnapshot comSnapshot = pSnapshotItem->snapshotID().isNull()
-                          ? CSnapshot()
-                          : m_comMachine.FindSnapshot(pSnapshotItem->snapshotID());
-    if (!comSnapshot.isNull() && comSnapshot.isOk() && comSnapshot.GetName() != pSnapshotItem->text(0))
-        comSnapshot.SetName(pSnapshotItem->text(0));
+    AssertPtr(pSnapshotItem);
+    if (pSnapshotItem)
+    {
+        /* Make sure that's a snapshot item indeed: */
+        CSnapshot comSnapshot = pSnapshotItem->snapshot();
+        if (comSnapshot.isNotNull())
+        {
+            /* Rename corresponding snapshot if necessary: */
+            if (comSnapshot.GetName() != pSnapshotItem->text(0))
+            {
+                /* We need to open a session when we manipulate the snapshot data of a machine: */
+                CSession comSession = vboxGlobal().openExistingSession(comSnapshot.GetMachine().GetId());
+                if (!comSession.isNull())
+                {
+                    // TODO: Add settings save validation.
+
+                    /* Save snapshot name: */
+                    comSnapshot.SetName(pSnapshotItem->text(0));
+
+                    /* Close the session again: */
+                    comSession.UnlockMachine();
+                }
+            }
+        }
+    }
 
     /* Allows editing again: */
@@ -803 +913 @@
     AssertReturnVoid(pSnapshotItem);
 
-    /* Handle Ctrl+DoubleClick: */
-    if (QApplication::keyboardModifiers() == Qt::ControlModifier)
-    {
-        /* As snapshot-restore procedure: */
-        restoreSnapshot(true /* suppress non-critical warnings */);
+    /* If this is a snapshot item: */
+    if (   m_pCurrentSnapshotItem
+        && pSnapshotItem
+        && !pSnapshotItem->isCurrentStateItem())
+    {
+        /* Handle Ctrl+DoubleClick: */
+        if (QApplication::keyboardModifiers() == Qt::ControlModifier)
+        {
+            /* As snapshot-restore procedure: */
+            restoreSnapshot(true /* suppress non-critical warnings */);
+        }
+        /* Handle other kinds of DoubleClick: */
+        else
+        {
+            /* As show details-widget procedure: */
+            m_pActionShowSnapshotDetails->setChecked(true);
+        }
     }
 }
@@ -862 +984 @@
         /* Prepare tree-widget: */
         prepareTreeWidget();
+        /* Prepare details-widget: */
+        prepareDetailsWidget();
     }
 }
@@ -912 +1036 @@
                                                                                      ":/snapshot_show_details_16px.png",
                                                                                      ":/snapshot_show_details_disabled_22px.png",
-                                                                                     ":/snapshot_details_show_disabled_16px.png"),
-                                                             QString(), this, &UISnapshotPane::sltShowSnapshotDetails);
+                                                                                     ":/snapshot_show_details_disabled_16px.png"),
+                                                             QString());
         {
+            connect(m_pActionShowSnapshotDetails, &QAction::toggled,
+                    this, &UISnapshotPane::sltToggleSnapshotDetailsVisibility);
+            m_pActionShowSnapshotDetails->setCheckable(true);
             m_pActionShowSnapshotDetails->setShortcut(QString("Ctrl+Space"));
+        }
+
+        /* Add Commit Snapshot Details action: */
+        m_pActionCommitSnapshotDetails = m_pToolBar->addAction(UIIconPool::iconSetFull(":/snapshot_commit_details_22px.png",
+                                                                                       ":/snapshot_commit_details_16px.png",
+                                                                                       ":/snapshot_commit_details_disabled_22px.png",
+                                                                                       ":/snapshot_commit_details_disabled_16px.png"),
+                                                               QString(), this, &UISnapshotPane::sltCommitSnapshotDetailsChanges);
+        {
+            connect(m_pActionShowSnapshotDetails, &QAction::toggled,
+                    m_pActionCommitSnapshotDetails, &QAction::setVisible);
+            m_pActionCommitSnapshotDetails->setShortcut(QString("Ctrl+Return"));
         }
 
@@ -942 +1081 @@
     {
         /* Configure tree: */
+        m_pSnapshotTree->setExpandsOnDoubleClick(false);
+        m_pSnapshotTree->setEditTriggers(  QAbstractItemView::SelectedClicked
+                                         | QAbstractItemView::EditKeyPressed);
         connect(m_pSnapshotTree, &UISnapshotTree::currentItemChanged,
                 this, &UISnapshotPane::sltHandleCurrentItemChange);
@@ -953 +1095 @@
         /* Add into layout: */
         layout()->addWidget(m_pSnapshotTree);
+    }
+}
+
+void UISnapshotPane::prepareDetailsWidget()
+{
+    /* Create details-widget: */
+    m_pDetailsWidget = new UISnapshotDetailsWidget;
+    AssertPtrReturnVoid(m_pDetailsWidget);
+    {
+        /* Configure details-widget: */
+        m_pDetailsWidget->setVisible(false);
+        connect(m_pDetailsWidget, &UISnapshotDetailsWidget::sigDataChanged,
+                m_pActionCommitSnapshotDetails, &QAction::setEnabled);
+
+        /* Add into layout: */
+        layout()->addWidget(m_pDetailsWidget);
     }
 }
@@ -1179 +1337 @@
     do
     {
-        /* Acquire currently chosen snapshot item: */
+        /* Acquire current snapshot item: */
         const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
         AssertPtr(pSnapshotItem);
@@ -1253 +1411 @@
     do
     {
-        /* Acquire currently chosen snapshot item: */
+        /* Acquire current snapshot item: */
         const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
         AssertPtr(pSnapshotItem);
@@ -1322 +1480 @@
 }
 
-void UISnapshotPane::showSnapshotDetails()
-{
-    /* Acquire currently chosen snapshot item: */
-    const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
-    AssertReturnVoid(pSnapshotItem);
-
-    /* Get corresponding snapshot: */
-    const CSnapshot comSnapshot = pSnapshotItem->snapshot();
-    AssertReturnVoid(!comSnapshot.isNull());
-
-    /* Show Snapshot Details dialog: */
-    QPointer<VBoxSnapshotDetailsDlg> pDlg = new VBoxSnapshotDetailsDlg(this);
-    pDlg->setData(*pSnapshotItem, comSnapshot);
-    if (pDlg->exec() == QDialog::Accepted)
-        pDlg->saveData();
-    if (pDlg)
-        delete pDlg;
-}
-
 void UISnapshotPane::cloneSnapshot()
 {
-    /* Acquire currently chosen snapshot item: */
+    /* Acquire current snapshot item: */
     const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
     AssertReturnVoid(pSnapshotItem);

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

@@ -32 +32 @@
 class QTreeWidgetItem;
 class QITreeWidgetItem;
+class UISnapshotDetailsWidget;
+class UISnapshotItem;
 class UISnapshotTree;
-class UISnapshotItem;
 class UIToolBar;
 
@@ -91 +92 @@
     /** @name Toolbar handlers.
       * @{ */
-        /** Proposes to take a snapshot. */
+        /** Handles command to take a snapshot. */
         void sltTakeSnapshot() { takeSnapshot(); }
-        /** Proposes to restore the snapshot. */
+        /** Handles command to restore the snapshot. */
         void sltRestoreSnapshot() { restoreSnapshot(); }
-        /** Proposes to delete the snapshot. */
+        /** Handles command to delete the snapshot. */
         void sltDeleteSnapshot() { deleteSnapshot(); }
-        /** Displays the snapshot details dialog. */
-        void sltShowSnapshotDetails() { showSnapshotDetails(); }
+        /** Handles command to make snapshot details @a fVisible. */
+        void sltToggleSnapshotDetailsVisibility(bool fVisible);
+        /** Handles command to commit snapshot details changes. */
+        void sltCommitSnapshotDetailsChanges();
         /** Proposes to clone the snapshot. */
         void sltCloneSnapshot() { cloneSnapshot(); }
@@ -127 +130 @@
         /** Prepares tree-widget. */
         void prepareTreeWidget();
+        /** Prepares details-widget. */
+        void prepareDetailsWidget();
 
         /** Refreshes everything. */
@@ -145 +150 @@
         /** Proposes to restore the snapshot. */
         bool restoreSnapshot(bool fSuppressNonCriticalWarnings = false);
-        /** Displays the snapshot details dialog. */
-        void showSnapshotDetails();
         /** Proposes to clone the snapshot. */
         void cloneSnapshot();
@@ -198 +201 @@
         /** Holds the Show Snapshot Details action instance. */
         QAction   *m_pActionShowSnapshotDetails;
+        /** Holds the Commit Snapshot Details action instance. */
+        QAction   *m_pActionCommitSnapshotDetails;
         /** Holds the Clone Snapshot action instance. */
         QAction   *m_pActionCloneSnapshot;
@@ -205 +210 @@
         /** Holds the current snapshot item reference. */
         UISnapshotItem *m_pCurrentSnapshotItem;
+
+        /** Holds the details-widget instance. */
+        UISnapshotDetailsWidget *m_pDetailsWidget;
     /** @} */
 };