Changeset 6904 in vbox for trunk

Timestamp:

Feb 11, 2008 5:11:29 PM (17 years ago)

Author:

vboxsync

Message:

2669: Create VM context menu in the Selector window:

Feature implemented (context menu + pause/resume action).
Waiting for pause_dis_16.png icon.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• include/VBoxSelectorWnd.h (modified) (5 diffs)
• src/VBoxGlobal.cpp (modified) (2 diffs)
• src/VBoxSelectorWnd.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -415 +415 @@
 #endif
 
-    CSession openSession (const QUuid &id);
+    CSession openSession (const QUuid &id, bool aExisting = false);
 
     bool startMachine (const QUuid &id);

trunk/src/VBox/Frontends/VirtualBox/include/VBoxSelectorWnd.h

@@ -26 +26 @@
 #include <qapplication.h>
 #include <qmainwindow.h>
+#include <qlistbox.h>
 #include <qgroupbox.h>
 #include <qaction.h>
@@ -67 +68 @@
     void vmStart();
     void vmDiscard();
+    void vmPause (bool);
     void vmRefresh();
     void vmShowLogs();
@@ -74 +76 @@
                                           bool aSnapshots,
                                           bool aDescription);
+
+    void showContextMenu (QListBoxItem *, const QPoint &);
 
 protected:
@@ -105 +109 @@
 private:
 
+    /* context menu */
+    QPopupMenu *mVmMenu;
+
     /* actions */
     QAction *fileDiskMgrAction;
@@ -114 +121 @@
     QAction *vmStartAction;
     QAction *vmDiscardAction;
+    QAction *vmPauseAction;
     QAction *vmRefreshAction;
     QAction *vmShowLogsAction;

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

@@ -1828 +1828 @@
  *  it is no more necessary.
  */
-CSession VBoxGlobal::openSession (const QUuid &id)
+CSession VBoxGlobal::openSession (const QUuid &id, bool aExisting)
 {
     CSession session;
@@ -1838 +1838 @@
     }
 
-    mVBox.OpenSession (session, id);
+    aExisting ? mVBox.OpenExistingSession (session, id) :
+                        mVBox.OpenSession (session, id);
     if (!mVBox.isOk())
     {

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

@@ -418 +418 @@
         "vm_discard.png", "discard_16px.png",
         "vm_discard_dis.png", "discard_dis_16px.png"));
+    vmPauseAction = new QAction (this, "vmPauseAction");
+    vmPauseAction->setToggleAction (true);
+    vmPauseAction->setIconSet (VBoxGlobal::iconSet (
+        "pause_16px.png", "pause_16px.png"));
     vmRefreshAction = new QAction (this, "vmRefreshAction");
     vmRefreshAction->setIconSet (VBoxGlobal::iconSet (
@@ -511 +515 @@
     menuBar()->insertItem( QString::null, fileMenu, 1);
 
-    QPopupMenu *vmMenu = new QPopupMenu (this, "vmMenu");
-    vmNewAction->addTo (vmMenu);
-    vmConfigAction->addTo (vmMenu);
-    vmDeleteAction->addTo (vmMenu);
-    vmMenu->insertSeparator();
-    vmStartAction->addTo (vmMenu);
-    vmDiscardAction->addTo (vmMenu);
-    vmMenu->insertSeparator();
-    vmRefreshAction->addTo (vmMenu);
-    vmMenu->insertSeparator();
-    vmShowLogsAction->addTo (vmMenu);
-
-    menuBar()->insertItem (QString::null, vmMenu, 2);
+    mVmMenu = new QPopupMenu (this, "mVmMenu");
+    vmNewAction->addTo (mVmMenu);
+    vmConfigAction->addTo (mVmMenu);
+    vmDeleteAction->addTo (mVmMenu);
+    mVmMenu->insertSeparator();
+    vmStartAction->addTo (mVmMenu);
+    vmDiscardAction->addTo (mVmMenu);
+    mVmMenu->insertSeparator();
+    vmPauseAction->addTo (mVmMenu);
+    mVmMenu->insertSeparator();
+    vmRefreshAction->addTo (mVmMenu);
+    mVmMenu->insertSeparator();
+    vmShowLogsAction->addTo (mVmMenu);
+
+    menuBar()->insertItem (QString::null, mVmMenu, 2);
 
     QPopupMenu *helpMenu = new QPopupMenu( this, "helpMenu" );
@@ -596 +602 @@
     connect (vmStartAction, SIGNAL (activated()), this, SLOT (vmStart()));
     connect (vmDiscardAction, SIGNAL (activated()), this, SLOT (vmDiscard()));
+    connect (vmPauseAction, SIGNAL (toggled (bool)), this, SLOT (vmPause (bool)));
     connect (vmRefreshAction, SIGNAL (activated()), this, SLOT (vmRefresh()));
     connect (vmShowLogsAction, SIGNAL (activated()), this, SLOT (vmShowLogs()));
@@ -616 +623 @@
     connect (vmListBox, SIGNAL (selected (QListBoxItem *)),
              this, SLOT (vmStart()));
+    connect (vmListBox, SIGNAL (contextMenuRequested (QListBoxItem *, const QPoint &)),
+             this, SLOT (showContextMenu (QListBoxItem *, const QPoint &)));
 
     connect (vmDetailsView, SIGNAL (linkClicked (const QString &)),
@@ -662 +671 @@
         QString curVMId = item ?
             QString (static_cast<VBoxVMListBoxItem*> (item)->id()) :
-                    QString::null;
+            QString::null;
         vbox.SetExtraData (VBoxDefs::GUI_LastVMSelected, curVMId);
     }
@@ -960 +969 @@
 }
 
+void VBoxSelectorWnd::vmPause (bool aPause)
+{
+    VBoxVMListBoxItem *item = (VBoxVMListBoxItem *) vmListBox->selectedItem();
+
+    AssertMsgReturn (item, ("Item must be always selected here"), (void) 0);
+
+    CSession session = vboxGlobal().openSession (item->id(), true);
+    if (session.isNull())
+        return;
+
+    CConsole console = session.GetConsole();
+    if (console.isNull())
+        return;
+
+    if (aPause)
+        console.Pause();
+    else
+        console.Resume();
+
+    bool ok = console.isOk();
+    if (!ok)
+    {
+        if (aPause)
+            vboxProblem().cannotPauseMachine (console);
+        else
+            vboxProblem().cannotResumeMachine (console);
+    }
+
+    session.Close();
+}
+
 void VBoxSelectorWnd::vmRefresh()
 {
@@ -993 +1033 @@
     if (item && item->id() == aID)
         vmListBoxCurrentChanged (aDetails, aSnapshots, aDescription);
+}
+
+void VBoxSelectorWnd::showContextMenu (QListBoxItem *aItem, const QPoint &aPoint)
+{
+    if (aItem)
+        mVmMenu->exec (aPoint);
 }
 
@@ -1210 +1256 @@
         vmDeleteAction->setEnabled (modifyEnabled);
         vmDiscardAction->setEnabled (state == CEnums::Saved && !running);
+        vmPauseAction->setEnabled (state == CEnums::Running ||
+                                   state == CEnums::Paused);
 
         /* change the Start button text accordingly */
@@ -1229 +1277 @@
 
             vmStartAction->setEnabled (!running);
+        }
+
+        /* change the Pause/Resume button text accordingly */
+        if (state == CEnums::Paused)
+        {
+            vmPauseAction->setMenuText (tr ("R&esume"));
+            vmPauseAction->setText (tr ("Resume"));
+            vmPauseAction->setAccel (tr ("Ctrl+P"));
+            vmPauseAction->setStatusTip (
+                tr ("Resume the execution of the virtual machine"));
+            vmPauseAction->blockSignals (true);
+            vmPauseAction->setOn (true);
+            vmPauseAction->blockSignals (false);
+        }
+        else
+        {
+            vmPauseAction->setMenuText (tr ("&Pause"));
+            vmPauseAction->setText (tr ("Pause"));
+            vmPauseAction->setAccel (tr ("Ctrl+P"));
+            vmPauseAction->setStatusTip (
+                tr ("Suspend the execution of the virtual machine"));
+            vmPauseAction->blockSignals (true);
+            vmPauseAction->setOn (false);
+            vmPauseAction->blockSignals (false);
         }
 
@@ -1286 +1358 @@
         vmDeleteAction->setEnabled (item != NULL);
         vmDiscardAction->setEnabled (false);
+        vmPauseAction->setEnabled (false);
 
         /* change the Start button text accordingly */