Changeset 18080 in vbox

Timestamp:

Mar 18, 2009 9:38:05 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3734: New VM wizard: HDD selection - implemented.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxNewVMWzd.h (modified) (1 diff)
• src/VBoxNewVMWzd.cpp (modified) (8 diffs)
• ui/VBoxNewVMWzd.ui (modified) (3 diffs)

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

@@ -50 +50 @@
     void accept();
     void showMediaManager();
-    void showNewHDWizard();
     void onOSTypeChanged();
     void slRAMValueChanged (int aValue);
     void leRAMTextChanged (const QString &aTtext);
+    void hdTypeChanged();
     void revalidate (QIWidgetValidator *aWval);
     void enableNext (const QIWidgetValidator *aWval);
     void onPageShow();
+    void showBackPage();
     void showNextPage();
 
 private:
 
+    bool showNewHDWizard();
     bool constructMachine();
     void ensureNewHardDiskDeleted();

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

@@ -88 +88 @@
 
     /* HDD Images page */
+    QStyleOptionButton options;
+    options.initFrom (mNewVDIRadio);
+    QGridLayout *hdLayout = qobject_cast <QGridLayout*> (mGbHDA->layout());
+    int wid = mNewVDIRadio->style()->subElementRect (QStyle::SE_RadioButtonIndicator, &options, mNewVDIRadio).width() +
+              mNewVDIRadio->style()->pixelMetric (QStyle::PM_RadioButtonLabelSpacing, &options, mNewVDIRadio) -
+              hdLayout->spacing() - 1;
+    QSpacerItem *spacer = new QSpacerItem (wid, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
+    hdLayout->addItem (spacer, 2, 0);
     mHDCombo->setType (VBoxDefs::MediaType_HardDisk);
     mHDCombo->repopulate();
+    mTbVmm->setIcon (VBoxGlobal::iconSet (":/select_file_16px.png",
+                                          ":/select_file_dis_16px.png"));
 
     mWvalHDD = new QIWidgetValidator (mPageHDD, this);
@@ -97 +107 @@
              this, SLOT (revalidate (QIWidgetValidator*)));
     connect (mGbHDA, SIGNAL (toggled (bool)), mWvalHDD, SLOT (revalidate()));
+    connect (mNewVDIRadio, SIGNAL (toggled (bool)), this, SLOT (hdTypeChanged()));
+    connect (mExistRadio, SIGNAL (toggled (bool)), this, SLOT (hdTypeChanged()));
     connect (mHDCombo, SIGNAL (currentIndexChanged (int)),
              mWvalHDD, SLOT (revalidate()));
-    connect (mPbNewHD, SIGNAL (clicked()), this, SLOT (showNewHDWizard()));
-    connect (mPbExistingHD, SIGNAL (clicked()), this, SLOT (showMediaManager()));
+    connect (mTbVmm, SIGNAL (clicked()), this, SLOT (showMediaManager()));
 
     /* Name and OS page */
@@ -107 +118 @@
     /* Memory page */
     slRAMValueChanged (mSlRAM->value());
+
+    /* HDD Images page */
+    hdTypeChanged();
 
     /* Initial revalidation */
@@ -201 +215 @@
 }
 
-void VBoxNewVMWzd::showNewHDWizard()
-{
-    VBoxNewHDWzd dlg (this);
-
-    dlg.setRecommendedFileName (mLeName->text());
-    dlg.setRecommendedSize (mOSTypeSelector->type().GetRecommendedHDD());
-
-    if (dlg.exec() == QDialog::Accepted)
-    {
-        ensureNewHardDiskDeleted();
-        mHardDisk = dlg.hardDisk();
-        mHDCombo->setCurrentItem (mHardDisk.GetId());
-    }
-
-    mHDCombo->setFocus();
-}
-
 void VBoxNewVMWzd::onOSTypeChanged()
 {
@@ -231 +228 @@
 {
     mSlRAM->setValue (aText.toInt());
+}
+
+void VBoxNewVMWzd::hdTypeChanged()
+{
+    mHDCombo->setEnabled (mExistRadio->isChecked());
+    mTbVmm->setEnabled (mExistRadio->isChecked());
+    if (mExistRadio->isChecked())
+        mHDCombo->setFocus();
 }
 
@@ -287 +292 @@
 }
 
+void VBoxNewVMWzd::showBackPage()
+{
+    /* Delete temporary HD if present */
+    if (sender() == mBtnBack5)
+        ensureNewHardDiskDeleted();
+
+    /* Switch to the back page */
+    QIAbstractWizard::showBackPage();
+}
+
 void VBoxNewVMWzd::showNextPage()
 {
@@ -294 +309 @@
         return;
 
+    /* Show the New Hard Disk wizard */
+    if (sender() == mBtnNext4 && mNewVDIRadio->isChecked() &&
+        !showNewHDWizard())
+        return;
+
     /* Switch to the next page */
     QIAbstractWizard::showNextPage();
 }
 
+
+bool VBoxNewVMWzd::showNewHDWizard()
+{
+    VBoxNewHDWzd dlg (this);
+
+    dlg.setRecommendedFileName (mLeName->text());
+    dlg.setRecommendedSize (mOSTypeSelector->type().GetRecommendedHDD());
+
+    if (dlg.exec() == QDialog::Accepted)
+    {
+        ensureNewHardDiskDeleted();
+        mHardDisk = dlg.hardDisk();
+        mHDCombo->setCurrentItem (mHardDisk.GetId());
+        return true;
+    }
+
+    return false;
+}
 
 bool VBoxNewVMWzd::constructMachine()
@@ -360 +398 @@
         {
             CMachine m = session.GetMachine();
-            m.AttachHardDisk(mHDCombo->id(), QString("IDE"), 0, 0);
+            m.AttachHardDisk (mHDCombo->id(), QString("IDE"), 0, 0);
             if (m.isOk())
             {

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

@@ -824 +824 @@
              </property>
              <layout class="QGridLayout" >
-              <property name="topMargin" >
-               <number>4</number>
-              </property>
-              <item row="1" column="0" >
-               <widget class="QPushButton" name="mPbNewHD" >
+              <item row="0" column="0" colspan="3" >
+               <widget class="QRadioButton" name="mNewVDIRadio" >
                 <property name="text" >
-                 <string>N&amp;ew...</string>
+                 <string>&amp;Create new hard disk</string>
+                </property>
+                <property name="checked">
+                 <bool>true</bool>
                 </property>
                </widget>
               </item>
-              <item row="1" column="1" >
-               <widget class="QPushButton" name="mPbExistingHD" >
+              <item row="1" column="0" colspan="3" >
+               <widget class="QRadioButton" name="mExistRadio" >
                 <property name="text" >
-                 <string>E&amp;xisting...</string>
+                 <string>&amp;Use existing hard disk</string>
                 </property>
                </widget>
               </item>
-              <item row="1" column="2" >
-               <spacer>
-                <property name="orientation" >
-                 <enum>Qt::Horizontal</enum>
-                </property>
-                <property name="sizeHint" >
-                 <size>
-                  <width>0</width>
-                  <height>0</height>
-                 </size>
-                </property>
-               </spacer>
-              </item>
-              <item row="0" column="0" colspan="3" >
+              <item row="2" column="1" >
                <widget class="VBoxMediaComboBox" name="mHDCombo" >
                 <property name="sizePolicy" >
@@ -861 +848 @@
                   <verstretch>0</verstretch>
                  </sizepolicy>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="2" >
+               <widget class="QToolButton" name="mTbVmm" >
+                <property name="autoRaise" >
+                 <bool>true</bool>
                 </property>
                </widget>
@@ -1199 +1193 @@
   <tabstop>mBtnNext3</tabstop>
   <tabstop>mBtnCancel3</tabstop>
+  <tabstop>mNewVDIRadio</tabstop>
+  <tabstop>mExistRadio</tabstop>
   <tabstop>mHDCombo</tabstop>
-  <tabstop>mPbNewHD</tabstop>
-  <tabstop>mPbExistingHD</tabstop>
+  <tabstop>mTbVmm</tabstop>
   <tabstop>mBtnBack4</tabstop>
   <tabstop>mBtnNext4</tabstop>