Changeset 90599 in vbox for trunk/src/VBox

Timestamp:

Aug 10, 2021 1:18:31 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. More work on the first page of the clone vm wizard.

Location:

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

Files:

• clonevm/UIWizardCloneVMPageBasic1.cpp (modified) (2 diffs)
• clonevm/UIWizardCloneVMPageBasic1.h (modified) (2 diffs)
• editors/UIWizardCloneVMEditors.cpp (modified) (12 diffs)
• editors/UIWizardCloneVMEditors.h (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.cpp

@@ -199 +199 @@
 void UIWizardCloneVMPageBasic1::retranslateUi()
 {
-    // /* Translate page: */
     setTitle(UIWizardCloneVM::tr("New machine name and path"));
 
@@ -206 +205 @@
                                                   "The new machine will be a clone of the machine <b>%1</b>.</p>")
                               .arg(m_strOriginalName));
+
+    int iMaxWidth = 0;
+    if (m_pNamePathEditor)
+        iMaxWidth = qMax(iMaxWidth, m_pNamePathEditor->firstColumnWidth());
+    if (m_pAdditionalOptionsEditor)
+        iMaxWidth = qMax(iMaxWidth, m_pAdditionalOptionsEditor->firstColumnWidth());
+
+    if (m_pNamePathEditor)
+        m_pNamePathEditor->setFirstColumnWidth(iMaxWidth);
+    if (m_pAdditionalOptionsEditor)
+        m_pAdditionalOptionsEditor->setFirstColumnWidth(iMaxWidth);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.h

@@ -79 +79 @@
 //     QLabel      *m_pMACComboBoxLabel;
 //     QComboBox   *m_pMACComboBox;
-//     QCheckBox   *m_pKeepDiskNamesCheckBox;
-//     QCheckBox   *m_pKeepHWUUIDsCheckBox;
 // };
 
@@ -115 +113 @@
     QIRichTextLabel *m_pMainLabel;
     // QGridLayout     *m_pContainerLayout;
-    // QLabel          *m_pAdditionalOptionsLabel;
 
     UICloneVMNamePathEditor *m_pNamePathEditor;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardCloneVMEditors.cpp

@@ -18 +18 @@
 /* Qt includes: */
 // #include <QButtonGroup>
-// #include <QCheckBox>
+#include <QCheckBox>
 #include <QComboBox>
 // #include <QDir>
@@ -55 +55 @@
 UICloneVMNamePathEditor::UICloneVMNamePathEditor(const QString &strOriginalName, const QString &strDefaultPath, QWidget *pParent /* = 0 */)
     :QIWithRetranslateUI<QGroupBox>(pParent)
+    , m_pContainerLayout(0)
     , m_pNameLineEdit(0)
     , m_pPathSelector(0)
@@ -65 +66 @@
 }
 
+void UICloneVMNamePathEditor::setFirstColumnWidth(int iWidth)
+{
+    if (m_pContainerLayout)
+        m_pContainerLayout->setColumnMinimumWidth(0, iWidth);
+}
+
+int UICloneVMNamePathEditor::firstColumnWidth() const
+{
+    int iMaxWidth = 0;
+    if (m_pNameLabel)
+        iMaxWidth = qMax(iMaxWidth, m_pNameLabel->minimumSizeHint().width());
+    if (m_pPathLabel)
+        iMaxWidth = qMax(iMaxWidth, m_pPathLabel->minimumSizeHint().width());
+    return iMaxWidth;
+}
+
 void UICloneVMNamePathEditor::prepare()
 {
-    QGridLayout *pContainerLayout = new QGridLayout(this);
-    pContainerLayout->setContentsMargins(0, 0, 0, 0);
+    m_pContainerLayout = new QGridLayout(this);
+    m_pContainerLayout->setContentsMargins(0, 0, 0, 0);
 
     m_pNameLabel = new QLabel;
@@ -75 +92 @@
         m_pNameLabel->setAlignment(Qt::AlignRight);
         m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-        pContainerLayout->addWidget(m_pNameLabel, 0, 0, 1, 1);
+        m_pContainerLayout->addWidget(m_pNameLabel, 0, 0, 1, 1);
     }
 
@@ -81 +98 @@
     if (m_pNameLineEdit)
     {
-        pContainerLayout->addWidget(m_pNameLineEdit, 0, 1, 1, 1);
+        m_pContainerLayout->addWidget(m_pNameLineEdit, 0, 1, 1, 1);
         m_pNameLineEdit->setText(tr("%1 Clone").arg(m_strOriginalName));
     }
@@ -90 +107 @@
         m_pPathLabel->setAlignment(Qt::AlignRight);
         m_pPathLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-        pContainerLayout->addWidget(m_pPathLabel, 1, 0, 1, 1);
+        m_pContainerLayout->addWidget(m_pPathLabel, 1, 0, 1, 1);
     }
 
@@ -96 +113 @@
     if (m_pPathSelector)
     {
-        pContainerLayout->addWidget(m_pPathSelector, 1, 1, 1, 1);
+        m_pContainerLayout->addWidget(m_pPathSelector, 1, 1, 1, 1);
         m_pPathSelector->setPath(m_strDefaultPath);
     }
+
     retranslateUi();
 }
@@ -110 +128 @@
         m_pPathLabel->setText(tr("Path:"));
 }
+
 
 
@@ -119 +138 @@
 UICloneVMAdditionalOptionsEditor::UICloneVMAdditionalOptionsEditor(QWidget *pParent /* = 0 */)
     :QIWithRetranslateUI<QGroupBox>(pParent)
+    , m_pContainerLayout(0)
     , m_pMACComboBoxLabel(0)
     , m_pMACComboBox(0)
+    , m_pAdditionalOptionsLabel(0)
+    , m_pKeepDiskNamesCheckBox(0)
+    , m_pKeepHWUUIDsCheckBox(0)
 {
     prepare();
+}
+
+void UICloneVMAdditionalOptionsEditor::setFirstColumnWidth(int iWidth)
+{
+    if (m_pContainerLayout)
+        m_pContainerLayout->setColumnMinimumWidth(0, iWidth);
+}
+
+int UICloneVMAdditionalOptionsEditor::firstColumnWidth() const
+{
+    int iMaxWidth = 0;
+    if (m_pMACComboBoxLabel)
+        iMaxWidth = qMax(iMaxWidth, m_pMACComboBoxLabel->minimumSizeHint().width());
+    if (m_pAdditionalOptionsLabel)
+        iMaxWidth = qMax(iMaxWidth, m_pAdditionalOptionsLabel->minimumSizeHint().width());
+    return iMaxWidth;
 }
 
@@ -139 +178 @@
 void UICloneVMAdditionalOptionsEditor::prepare()
 {
-    QGridLayout *pContainerLayout = new QGridLayout(this);
-    pContainerLayout->setContentsMargins(0, 0, 0, 0);
+    m_pContainerLayout = new QGridLayout(this);
+    m_pContainerLayout->setContentsMargins(0, 0, 0, 0);
 
     m_pMACComboBoxLabel = new QLabel;
@@ -147 +186 @@
         m_pMACComboBoxLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
         m_pMACComboBoxLabel->setBuddy(m_pMACComboBox);
-        pContainerLayout->addWidget(m_pMACComboBoxLabel, 2, 0, 1, 1);
+        m_pContainerLayout->addWidget(m_pMACComboBoxLabel, 2, 0, 1, 1);
     }
 
     m_pMACComboBox = new QComboBox;
     if (m_pMACComboBox)
-        pContainerLayout->addWidget(m_pMACComboBox, 2, 1, 1, 1);
+        m_pContainerLayout->addWidget(m_pMACComboBox, 2, 1, 1, 1);
     populateMACAddressClonePolicies();
+
+
+    /* Load currently supported clone options: */
+    CSystemProperties comProperties = uiCommon().virtualBox().GetSystemProperties();
+    const QVector<KCloneOptions> supportedOptions = comProperties.GetSupportedCloneOptions();
+    /* Check whether we support additional clone options at all: */
+    int iVerticalPosition = 3;
+    const bool fSupportedKeepDiskNames = supportedOptions.contains(KCloneOptions_KeepDiskNames);
+    const bool fSupportedKeepHWUUIDs = supportedOptions.contains(KCloneOptions_KeepHwUUIDs);
+    if (fSupportedKeepDiskNames || fSupportedKeepHWUUIDs)
+    {
+        m_pAdditionalOptionsLabel = new QLabel;
+        if (m_pAdditionalOptionsLabel)
+        {
+            m_pAdditionalOptionsLabel->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+            m_pContainerLayout->addWidget(m_pAdditionalOptionsLabel, iVerticalPosition, 0, 1, 1);
+        }
+    }
+    if (fSupportedKeepDiskNames)
+    {
+        m_pKeepDiskNamesCheckBox = new QCheckBox;
+        if (m_pKeepDiskNamesCheckBox)
+            m_pContainerLayout->addWidget(m_pKeepDiskNamesCheckBox, iVerticalPosition++, 1, 1, 1);
+    }
+    if (fSupportedKeepHWUUIDs)
+    {
+        m_pKeepHWUUIDsCheckBox = new QCheckBox;
+        if (m_pKeepHWUUIDsCheckBox)
+            m_pContainerLayout->addWidget(m_pKeepHWUUIDsCheckBox, iVerticalPosition++, 1, 1, 1);
+    }
+
+
     retranslateUi();
 }
@@ -187 +258 @@
         }
     }
+
+    if (m_pAdditionalOptionsLabel)
+        m_pAdditionalOptionsLabel->setText(tr("Additional Options:"));
+    if (m_pKeepDiskNamesCheckBox)
+    {
+        m_pKeepDiskNamesCheckBox->setToolTip(tr("Don't change the disk names during cloning."));
+        m_pKeepDiskNamesCheckBox->setText(tr("Keep &Disk Names"));
+    }
+    if (m_pKeepHWUUIDsCheckBox)
+    {
+        m_pKeepHWUUIDsCheckBox->setToolTip(tr("Don't change hardware UUIDs during cloning."));
+        m_pKeepHWUUIDsCheckBox->setText(tr("Keep &Hardware UUIDs"));
+    }
+
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/editors/UIWizardCloneVMEditors.h

@@ -33 +33 @@
 // class CMediumFormat;
 // class QButtonGroup;
-// class QCheckBox;
-// class QGridLayout;
+class QCheckBox;
+class QGridLayout;
 class QComboBox;
 class QLabel;
@@ -74 +74 @@
     UICloneVMNamePathEditor(const QString &strOriginalName, const QString &strDefaultPath, QWidget *pParent = 0);
 
+    void setFirstColumnWidth(int iWidth);
+    int firstColumnWidth() const;
+
     QString name() const;
     void setName(const QString &strName);
@@ -81 +84 @@
     bool isComplete();
 
+
 private:
 
@@ -86 +90 @@
     virtual void retranslateUi() /* override final */;
 
+    QGridLayout *m_pContainerLayout;
     QILineEdit  *m_pNameLineEdit;
     UIFilePathSelector *m_pPathSelector;
@@ -111 +116 @@
     MACAddressClonePolicy macAddressClonePolicy() const;
     void setMACAddressClonePolicy(MACAddressClonePolicy enmMACAddressClonePolicy);
+    void setFirstColumnWidth(int iWidth);
+    int firstColumnWidth() const;
 
 private:
@@ -118 +125 @@
     void populateMACAddressClonePolicies();
 
+    QGridLayout *m_pContainerLayout;
     QLabel *m_pMACComboBoxLabel;
     QComboBox *m_pMACComboBox;
-
+    QLabel *m_pAdditionalOptionsLabel;
+    QCheckBox   *m_pKeepDiskNamesCheckBox;
+    QCheckBox   *m_pKeepHWUUIDsCheckBox;
 };