Changeset 79032 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 7, 2019 7:28:32 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6769: UIApplianceImportEditorWidget: More convenient layout and NLS-tag for machine base folder label.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIApplianceImportEditorWidget.cpp (modified) (9 diffs)
• UIApplianceImportEditorWidget.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp

@@ -24 +24 @@
 
 /* GUI includes: */
-#include "QIRichTextLabel.h"
 #include "QITreeView.h"
 #include "UIApplianceImportEditorWidget.h"
@@ -68 +67 @@
 void UIApplianceImportEditorWidget::prepareWidgets()
 {
-    /* Create path selector label: */
-    m_pPathSelectorLabel = new QIRichTextLabel(this);
-    if (m_pPathSelectorLabel)
-    {
-        /* Add into layout: */
-        m_pLayout->addWidget(m_pPathSelectorLabel);
-    }
-
-    /* Create path selector editor: */
-    m_pPathSelector = new UIFilePathSelector(this);
-    if (m_pPathSelector)
-    {
-        m_pPathSelector->setResetEnabled(true);
-        m_pPathSelector->setDefaultPath(vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder());
-        m_pPathSelector->setPath(vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder());
-        connect(m_pPathSelector, &UIFilePathSelector::pathChanged, this, &UIApplianceImportEditorWidget::sltHandlePathChanged);
-
-        /* Add into layout: */
-        m_pLayout->addWidget(m_pPathSelector);
-    }
-
     /* Create options layout: */
     m_pOptionsLayout = new QGridLayout;
@@ -96 +74 @@
         m_pOptionsLayout->setColumnStretch(1, 1);
 
+        /* Create path selector label: */
+        m_pPathSelectorLabel = new QLabel;
+        if (m_pPathSelectorLabel)
+        {
+            m_pPathSelectorLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+
+            /* Add into layout: */
+            m_pOptionsLayout->addWidget(m_pPathSelectorLabel, 0, 0);
+        }
+
+        /* Create path selector editor: */
+        m_pPathSelector = new UIFilePathSelector;
+        if (m_pPathSelector)
+        {
+            m_pPathSelector->setResetEnabled(true);
+            m_pPathSelector->setDefaultPath(vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder());
+            m_pPathSelector->setPath(vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder());
+            m_pPathSelectorLabel->setBuddy(m_pPathSelector);
+
+            /* Add into layout: */
+            m_pOptionsLayout->addWidget(m_pPathSelector, 0, 1, 1, 2);
+        }
+
         /* Create MAC address policy label: */
         m_pMACComboBoxLabel = new QLabel;
@@ -103 +104 @@
 
             /* Add into layout: */
-            m_pOptionsLayout->addWidget(m_pMACComboBoxLabel, 0, 0);
+            m_pOptionsLayout->addWidget(m_pMACComboBoxLabel, 1, 0);
         }
 
@@ -114 +115 @@
 
             /* Add into layout: */
-            m_pOptionsLayout->addWidget(m_pMACComboBox, 0, 1, 1, 2);
+            m_pOptionsLayout->addWidget(m_pMACComboBox, 1, 1, 1, 2);
         }
 
@@ -124 +125 @@
 
             /* Add into layout: */
-            m_pOptionsLayout->addWidget(m_pAdditionalOptionsLabel, 1, 0);
+            m_pOptionsLayout->addWidget(m_pAdditionalOptionsLabel, 2, 0);
         }
 
@@ -133 +134 @@
 
             /* Add into layout: */
-            m_pOptionsLayout->addWidget(m_pImportHDsAsVDI, 1, 1);
+            m_pOptionsLayout->addWidget(m_pImportHDsAsVDI, 2, 1);
         }
 
@@ -142 +143 @@
     /* Populate MAC address import combo: */
     populateMACAddressImportPolicies();
-    /* And connect this combo' signals afterwards: */
+    /* And connect signals afterwards: */
+    connect(m_pPathSelector, &UIFilePathSelector::pathChanged,
+            this, &UIApplianceImportEditorWidget::sltHandlePathChanged);
     connect(m_pMACComboBox, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, &UIApplianceImportEditorWidget::sltHandleMACAddressImportPolicyComboChange);
@@ -314 +317 @@
     UIApplianceEditorWidget::retranslateUi();
     if (m_pPathSelectorLabel)
-        m_pPathSelectorLabel->setText(UIWizardImportApp::tr("You can modify the base folder which will host all the virtual machines. "
-                                                            "Home folders can also be individually (per virtual machine) modified."));
+        m_pPathSelectorLabel->setText(tr("&Machine Base Folder:"));
     if (m_pImportHDsAsVDI)
     {

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.h

@@ -27 +27 @@
 /* Forward declarations: */
 class UIFilePathSelector;
-class QIRichTextLabel;
 class QComboBox;
 class QGridLayout;
@@ -70 +69 @@
     void    updateMACAddressImportPolicyComboToolTip();
 
-    QIRichTextLabel    *m_pPathSelectorLabel;
+    QLabel             *m_pPathSelectorLabel;
     UIFilePathSelector *m_pPathSelector;
     /** Holds the checkbox that controls 'import HDs as VDI' behaviour. */