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

Timestamp:

May 22, 2012 4:23:13 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78113

Message:

FE/Qt: First Run wizard: Removing group-box.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards

Files:

• UIWizard.cpp (modified) (1 diff)
• firstrun/UIWizardFirstRunPageBasic.cpp (modified) (3 diffs)
• firstrun/UIWizardFirstRunPageBasic.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp

@@ -410 +410 @@
             break;
         case UIWizardType_FirstRun:
-            dRatio += 0.4;
+            dRatio += 0.3;
             break;
         default:

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp

@@ -21 +21 @@
 #include <QVBoxLayout>
 #include <QHBoxLayout>
-#include <QGroupBox>
 
 /* Local includes: */
@@ -66 +65 @@
         pMainLayout->setContentsMargins(8, 0, 8, 0);
         m_pLabel = new QIRichTextLabel(this);
-        m_pSourceCnt = new QGroupBox(this);
+        QHBoxLayout *pSourceDiskLayout = new QHBoxLayout;
         {
-            m_pSourceCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-            QHBoxLayout *pSourceCntLayout = new QHBoxLayout(m_pSourceCnt);
+            m_pMediaSelector = new VBoxMediaComboBox(this);
             {
-                m_pMediaSelector = new VBoxMediaComboBox(m_pSourceCnt);
-                {
-                    m_pMediaSelector->setMachineId(strMachineId);
-                    m_pMediaSelector->setType(VBoxDefs::MediumType_DVD);
-                    m_pMediaSelector->repopulate();
-                }
-                m_pSelectMediaButton = new QIToolButton(m_pSourceCnt);
-                {
-                    m_pSelectMediaButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_dis_16px.png"));
-                    m_pSelectMediaButton->setAutoRaise(true);
-                }
-                pSourceCntLayout->addWidget(m_pMediaSelector);
-                pSourceCntLayout->addWidget(m_pSelectMediaButton);
+                m_pMediaSelector->setMachineId(strMachineId);
+                m_pMediaSelector->setType(VBoxDefs::MediumType_DVD);
+                m_pMediaSelector->repopulate();
             }
+            m_pSelectMediaButton = new QIToolButton(this);
+            {
+                m_pSelectMediaButton->setIcon(UIIconPool::iconSet(":/select_file_16px.png", ":/select_file_dis_16px.png"));
+                m_pSelectMediaButton->setAutoRaise(true);
+            }
+            pSourceDiskLayout->addWidget(m_pMediaSelector);
+            pSourceDiskLayout->addWidget(m_pSelectMediaButton);
         }
         pMainLayout->addWidget(m_pLabel);
-        pMainLayout->addWidget(m_pSourceCnt);
+        pMainLayout->addLayout(pSourceDiskLayout);
         pMainLayout->addStretch();
     }
@@ -126 +121 @@
                                                "As this virtual machine has no hard drive "
                                                "you will not be able to install an operating system on it at the moment.</p>"));
-    m_pSourceCnt->setTitle(UIWizardFirstRun::tr("Start-up disk"));
     m_pSelectMediaButton->setToolTip(UIWizardFirstRun::tr("Choose a virtual optical disk file..."));
 }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.h

@@ -25 +25 @@
 /* Forward declarations: */
 class CMachine;
-class QGroupBox;
 class VBoxMediaComboBox;
 class QIToolButton;
@@ -49 +48 @@
 
     /* Widgets: */
-    QGroupBox *m_pSourceCnt;
     VBoxMediaComboBox *m_pMediaSelector;
     QIToolButton *m_pSelectMediaButton;