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

Timestamp:

May 23, 2007 12:53:00 PM (18 years ago)

Author:

vboxsync

Message:

1750: Add CDROM configuration to "Create VM" wizard:

CD/DVD Boot source selection Dialog implemented.

1. This dialog shows only during each VM first time started.
2. It allows to temporarily attach host CD/DVD drive into VM drive to load from it.
3. It allows to temporarily attach CD/DVD image file into VM drive to load from it.
4. User can invoke VDM Dialog (CD/DVD Filtered) from this dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• include/VBoxConsoleWnd.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (9 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -52 +52 @@
 VirtualBox_SDKS.linux = LIBSDL
 
-ifeq ($(BUILD_TARGET),darwin) 
+ifeq ($(BUILD_TARGET),darwin)
 # For the launch trick we need different inode numbers.
 VirtualBox_INST = $(INST_BIN)VirtualBox $(INST_BIN)VirtualBoxVM
@@ -83 +83 @@
 
 # Sources containing local definitions of classes that use the Q_OBJECT macro
-VirtualBox_QT_MOCSRCS = src/VBoxSelectorWnd.cpp
+VirtualBox_QT_MOCSRCS = src/VBoxSelectorWnd.cpp \
+                                                src/VBoxConsoleWnd.cpp
 ifneq ($(BUILD_TARGET),win)
 VirtualBox_QT_MOCSRCS += src/COMDefs.cpp

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

@@ -283 +283 @@
     QColor erase_color;
 
+    bool mIsFirstTimeStarted : 1;
+
 #ifdef VBOX_WITH_DEBUGGER_GUI
     // Debugger GUI

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

@@ -33 +33 @@
 #include "VBoxSharedFoldersSettings.h"
 #include "VBoxUtils.h"
+#include "VBoxMediaComboBox.h"
 #include "QIStateIndicator.h"
 #include "QIStatusBar.h"
@@ -49 +50 @@
 #include <qdir.h>
 #include <qpushbutton.h>
+#include <qtoolbutton.h>
 
 #include <qeventloop.h>
@@ -188 +190 @@
 
     QString mTip;
+};
+
+/**
+ *  Bootable CD/DVD ISO Selection Dialog class.
+ *  Allows user to select temporarily mounted image or host drive
+ *  to load the system from.
+ */
+class BootDVDDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+
+    BootDVDDialog (QWidget *aParent, CMachine &aMachine)
+        : QDialog (aParent, "BootDVDDialog", true /* modal */)
+        , mMachine (aMachine)
+        , mGrpBox (0)
+        , mRbHost (0), mRbImage (0)
+        , mCbHost (0), mCbImage (0)
+        , mTbVDM (0), mPbOk (0)
+    {
+        /* Setup Dialog's title */
+        setCaption (tr ("Select Boot Source"));
+        setIcon (QPixmap::fromMimeSource ("select_file_16px.png"));
+
+        /* Setup main group-box */
+        mGrpBox = new QButtonGroup (this, "mGrpBox");
+        mGrpBox->setCheckable (true);
+        mGrpBox->setChecked (false);
+        mGrpBox->setColumnLayout (0, Qt::Vertical);
+        mGrpBox->setTitle (tr ("&Mount CD/DVD Drive"));
+        mGrpBox->setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
+        connect (mGrpBox, SIGNAL (toggled (bool)), this, SLOT (grpBoxToggled (bool)));
+
+        /* Setup group box widgets */
+        mRbHost = new QRadioButton (tr ("Host CD/DVD &Drive"), mGrpBox, "mRbHost");
+        connect (mRbHost,  SIGNAL (clicked()), this, SLOT (rbClicked()));
+        mCbHost = new QComboBox (mGrpBox, "mCbHost");
+        CHostDVDDriveCollection coll = vboxGlobal().virtualBox().GetHost().GetDVDDrives();
+        mHostDVDs.resize (coll.GetCount());
+        int id = 0;
+        CHostDVDDriveEnumerator en = coll.Enumerate();
+        while (en.HasMore())
+        {
+            CHostDVDDrive hostDVD = en.GetNext();
+            mCbHost->insertItem (hostDVD.GetName(), id);
+            mHostDVDs [id] = hostDVD;
+            ++ id;
+        }
+
+        mRbImage = new QRadioButton (tr ("&ISO Image File"), mGrpBox, "mRbImage");
+        connect (mRbImage, SIGNAL (clicked()), this, SLOT (rbClicked()));
+        mCbImage = new VBoxMediaComboBox (mGrpBox, "sel", VBoxDefs::CD);
+        if (!vboxGlobal().isMediaEnumerationStarted())
+            vboxGlobal().startEnumeratingMedia();
+        else
+            mCbImage->refresh();
+        mTbVDM = new QToolButton (mGrpBox, "mTbVDM");
+        mTbVDM->setIconSet (VBoxGlobal::iconSet ("select_file_16px.png",
+                                                 "select_file_dis_16px.png"));
+        mTbVDM->setFocusPolicy (QWidget::TabFocus);
+        connect (mTbVDM, SIGNAL (clicked()), this, SLOT (vdmOpen()));
+
+        /* Setup group box layout */
+        QGridLayout *grbLayout = new QGridLayout (mGrpBox->layout(), 2, 3, 10, "grbLayout");
+        grbLayout->addWidget (mRbHost, 0, 0);
+        grbLayout->addWidget (mCbHost, 0, 1);
+        grbLayout->addWidget (mRbImage, 1, 0);
+        grbLayout->addWidget (mCbImage, 1, 1);
+        grbLayout->addWidget (mTbVDM, 1, 2);
+
+        /* Setup dialog buttons */
+        mPbOk = new QPushButton (tr ("OK"), this, "mPbOk");
+        QSpacerItem *spacer = new QSpacerItem (0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
+        QPushButton *pbCancel = new QPushButton (tr ("Cancel"), this, "pbCancel");
+        connect (mPbOk, SIGNAL (clicked()), this, SLOT (accept()));
+        connect (pbCancel, SIGNAL (clicked()), this, SLOT (reject()));
+
+        /* Setup main layout */
+        QVBoxLayout *mainLayout = new QVBoxLayout (this, 10, 10, "mainLayout");
+        mainLayout->addWidget (mGrpBox);
+        QSpacerItem *btSpacer =
+            new QSpacerItem (0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
+        mainLayout->addItem (btSpacer);
+
+        /* Setup buttons layout */
+        QHBoxLayout *buttonLayout = new QHBoxLayout (mainLayout, 10, "buttonLayout");
+        buttonLayout->addWidget (mPbOk);
+        buttonLayout->addItem (spacer);
+        buttonLayout->addWidget (pbCancel);
+    }
+
+private slots:
+
+    void grpBoxToggled (bool aOn)
+    {
+        if (aOn)
+            mRbHost->animateClick();
+        else
+        {
+            mRbHost->setChecked (false);
+            mRbImage->setChecked (false);
+            validate();
+        }
+    }
+
+    void rbClicked()
+    {
+        mCbHost->setEnabled (sender() == mRbHost);
+        mCbImage->setEnabled (sender() == mRbImage);
+        mTbVDM->setEnabled (sender() == mRbImage);
+        validate();
+    }
+
+    void vdmOpen()
+    {
+        VBoxDiskImageManagerDlg vdm (this, "VBoxDiskImageManagerDlg",
+                                     WType_Dialog | WShowModal);
+                QUuid machineId = mMachine.GetId();
+        vdm.setup (VBoxDefs::CD, true, &machineId);
+        if (vdm.exec() == VBoxDiskImageManagerDlg::Accepted)
+            mCbImage->setCurrentItem (vdm.getSelectedUuid());
+    }
+
+    void accept()
+    {
+        if (mGrpBox->isChecked() && mRbHost->isChecked())
+        {
+            CHostDVDDrive hostDrive = mHostDVDs [mCbHost->currentItem()];
+            if (!hostDrive.isNull())
+            {
+                CDVDDrive virtualDrive = mMachine.GetDVDDrive();
+                virtualDrive.CaptureHostDrive (hostDrive);
+            }
+        }
+        else if (mGrpBox->isChecked() && mRbImage->isChecked())
+        {
+            CDVDDrive virtualDrive = mMachine.GetDVDDrive();
+            virtualDrive.MountImage (mCbImage->getId());
+        }
+
+        QDialog::accept();
+    }
+
+private:
+
+    void validate()
+    {
+        bool valid =
+            !mGrpBox->isChecked() ||
+            (mGrpBox->isChecked() && mRbHost->isChecked()
+             && !mCbHost->currentText().isEmpty()) ||
+            (mGrpBox->isChecked() && mRbImage->isChecked()
+             && !mCbImage->currentText().isEmpty());
+        mPbOk->setEnabled (valid);
+    }
+
+    CMachine mMachine;
+    QButtonGroup *mGrpBox;
+    QRadioButton *mRbHost, *mRbImage;
+    QComboBox *mCbHost;
+    VBoxMediaComboBox *mCbImage;
+    QToolButton *mTbVDM;
+    QPushButton *mPbOk;
+    QValueVector <CHostDVDDrive> mHostDVDs;
 };
 
@@ -225 +392 @@
     , was_max (false)
     , console_style (0)
+    , mIsFirstTimeStarted (true)
 #ifdef VBOX_WITH_DEBUGGER_GUI
     , dbg_gui (NULL)
@@ -675 +843 @@
 static const char *GUI_Fullscreen = "GUI/Fullscreen";
 static const char *GUI_AutoresizeGuest = "GUI/AutoresizeGuest";
+static const char *GUI_FirstRun = "GUI/FirstRun";
 
 /**
@@ -726 +895 @@
         if (str != "off")
             vmAutoresizeGuestAction->setOn (true);
+
+        str = cmachine.GetExtraData (GUI_FirstRun);
+        if (str == "no")
+            mIsFirstTimeStarted = false;
 
         str = cmachine.GetExtraData (GUI_LastWindowPosition);
@@ -892 +1065 @@
     CConsole cconsole = console->console();
 
+    if (mIsFirstTimeStarted)
+    {
+        BootDVDDialog dlg (this, cmachine);
+        dlg.exec();
+    }
+
     /* start the VM */
     CProgress progress = cconsole.PowerUp();
@@ -993 +1172 @@
         machine.SetExtraData (GUI_AutoresizeGuest,
                               vmAutoresizeGuestAction->isOn() ? "on" : "off");
+        machine.SetExtraData (GUI_FirstRun, "no");
     }
 
@@ -2717 +2897 @@
 }
 
+#include "VBoxConsoleWnd.moc"