Changeset 47222 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 17, 2013 3:12:06 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: Snapshot widget: Handle Ctrl+DoubleClick as *snapshot-restore* procedure.

Location:

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

Files:

• VBoxSnapshotsWgt.cpp (modified) (5 diffs)
• VBoxSnapshotsWgt.h (modified) (1 diff)

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

@@ -29 +29 @@
 #include <QWindowsStyle>
 #include <QPointer>
+#include <QApplication>
 
 /* GUI includes: */
@@ -413 +414 @@
     connect (mTreeWidget, SIGNAL (itemChanged (QTreeWidgetItem*, int)),
              this, SLOT (onItemChanged (QTreeWidgetItem*)));
+    connect(mTreeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*, int)),
+            this, SLOT (sltItemDoubleClicked(QTreeWidgetItem*)));
 
     connect (mTakeSnapshotAction, SIGNAL (triggered()), this, SLOT (sltTakeSnapshot()));
@@ -570 +573 @@
 }
 
+void VBoxSnapshotsWgt::sltItemDoubleClicked(QTreeWidgetItem *pItem)
+{
+    /* Make sure *nothing* is being edited currently: */
+    if (mEditProtector)
+        return;
+
+    /* Make sure some *valid* item was *really* double-clicked: */
+    SnapshotWgtItem *pValidItem = pItem ? static_cast<SnapshotWgtItem*>(pItem) : 0;
+    if (!pValidItem)
+        return;
+
+    /* Handle Ctrl+DoubleClick: */
+    if (QApplication::keyboardModifiers() == Qt::ControlModifier)
+    {
+        /* As call for snapshot-restore procedure: */
+        sltRestoreSnapshot(true /* suppress non-critical warnings */);
+    }
+}
+
 void VBoxSnapshotsWgt::sltTakeSnapshot()
 {
@@ -575 +597 @@
 }
 
-void VBoxSnapshotsWgt::sltRestoreSnapshot()
+void VBoxSnapshotsWgt::sltRestoreSnapshot(bool fSuppressNonCriticalWarnings /*= false*/)
 {
     /* Get currently chosen item: */
@@ -587 +609 @@
 
     /* Ask the user if he really wants to restore the snapshot: */
-    int iResultCode = msgCenter().confirmSnapshotRestoring(snapshot.GetName(), mMachine.GetCurrentStateModified());
-    if (iResultCode & AlertButton_Cancel)
-        return;
+    int iResultCode = AlertButton_Ok;
+    if (!fSuppressNonCriticalWarnings || mMachine.GetCurrentStateModified())
+    {
+        iResultCode = msgCenter().confirmSnapshotRestoring(snapshot.GetName(), mMachine.GetCurrentStateModified());
+        if (iResultCode & AlertButton_Cancel)
+            return;
+    }
 
     /* If user also confirmed new snapshot creation: */

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

@@ -64 +64 @@
     void onContextMenuRequested (const QPoint &aPoint);
     void onItemChanged (QTreeWidgetItem *aItem);
+    void sltItemDoubleClicked(QTreeWidgetItem *pItem);
 
     /* Snapshot functionality slots: */
     void sltTakeSnapshot();
-    void sltRestoreSnapshot();
+    void sltRestoreSnapshot(bool fSuppressNonCriticalWarnings = false);
     void sltDeleteSnapshot();
     void sltShowSnapshotDetails();