Changeset 45084 in vbox

Timestamp:

Mar 19, 2013 9:17:45 AM (12 years ago)

Author:

vboxsync

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

84367

Message:

FE/Qt: Wizards: Import appliance: Get rid of QLabel-separators used in expert-mode pages, making look&feel more native and similar to other wizards.

Location:

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

Files:

• UIWizardImportAppPageExpert.cpp (modified) (4 diffs)
• UIWizardImportAppPageExpert.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp

@@ -21 +21 @@
 #include <QFileInfo>
 #include <QVBoxLayout>
+#include <QGroupBox>
 
 /* Local includes: */
@@ -26 +27 @@
 #include "UIWizardImportApp.h"
 #include "VBoxGlobal.h"
-#include "QILabelSeparator.h"
 #include "VBoxFilePathSelectorWidget.h"
 #include "UIApplianceImportEditorWidget.h"
@@ -37 +37 @@
         pMainLayout->setContentsMargins(8, 6, 8, 6);
         pMainLayout->setSpacing(10);
-        m_pVMApplianceLabel = new QILabelSeparator(this);
-        m_pFileSelector = new VBoxEmptyFileSelector(this);
+        m_pApplianceCnt = new QGroupBox(this);
         {
-            m_pFileSelector->setHomeDir(vboxGlobal().documentsPath());
-            m_pFileSelector->setMode(VBoxFilePathSelectorWidget::Mode_File_Open);
+            QVBoxLayout *pApplianceCntLayout = new QVBoxLayout(m_pApplianceCnt);
+            {
+                m_pFileSelector = new VBoxEmptyFileSelector(m_pApplianceCnt);
+                {
+                    m_pFileSelector->setHomeDir(vboxGlobal().documentsPath());
+                    m_pFileSelector->setMode(VBoxFilePathSelectorWidget::Mode_File_Open);
+                }
+                pApplianceCntLayout->addWidget(m_pFileSelector);
+            }
         }
-        m_pApplianceWidget = new UIApplianceImportEditorWidget(this);
+        m_pSettingsCnt = new QGroupBox(this);
         {
-            m_pApplianceWidget->setMinimumHeight(300);
-            m_pApplianceWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
-            m_pApplianceWidget->setFile(strFileName);
+            QVBoxLayout *pSettingsCntLayout = new QVBoxLayout(m_pSettingsCnt);
+            {
+                m_pApplianceWidget = new UIApplianceImportEditorWidget(m_pSettingsCnt);
+                {
+                    m_pApplianceWidget->setMinimumHeight(300);
+                    m_pApplianceWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
+                    m_pApplianceWidget->setFile(strFileName);
+                }
+                pSettingsCntLayout->addWidget(m_pApplianceWidget);
+            }
         }
-        pMainLayout->addWidget(m_pVMApplianceLabel);
-        pMainLayout->addWidget(m_pFileSelector);
-        pMainLayout->addWidget(m_pApplianceWidget);
+        pMainLayout->addWidget(m_pApplianceCnt);
+        pMainLayout->addWidget(m_pSettingsCnt);
         m_pFileSelector->setPath(strFileName);
     }
@@ -80 +92 @@
 {
     /* Translate widgets: */
-    m_pVMApplianceLabel->setText(UIWizardImportApp::tr("Appliance to import"));
+    m_pApplianceCnt->setTitle(UIWizardImportApp::tr("Appliance to import"));
     m_pFileSelector->setChooseButtonText(UIWizardImportApp::tr("Open appliance..."));
     m_pFileSelector->setFileDialogTitle(UIWizardImportApp::tr("Please choose a virtual appliance file to import"));
     m_pFileSelector->setFileFilters(UIWizardImportApp::tr("Open Virtualization Format (%1)").arg("*.ova *.ovf"));
+    m_pSettingsCnt->setTitle(UIWizardImportApp::tr("Appliance settings"));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2009-2012 Oracle Corporation
+ * Copyright (C) 2009-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 
 /* Forward declarations: */
-class QILabelSeparator;
+class QGroupBox;
 
 /* Expert page of the Import Appliance wizard: */
@@ -58 +58 @@
 
     /* Widgets: */
-    QILabelSeparator *m_pVMApplianceLabel;
+    QGroupBox *m_pApplianceCnt;
+    QGroupBox *m_pSettingsCnt;
 };