Changeset 90165 in vbox

Timestamp:

Jul 13, 2021 8:13:50 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9996. Using UIUserNamePasswordGroupBox

Location:

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

Files:

• editors/UIWizardNewVMEditors.cpp (modified) (1 diff)
• editors/UIWizardNewVMEditors.h (modified) (1 diff)
• newvm/UIWizardNewVMPageExpert.cpp (modified) (5 diffs)
• newvm/UIWizardNewVMPageExpert.h (modified) (3 diffs)
• newvm/UIWizardNewVMUnattendedPageBasic.cpp (modified) (7 diffs)
• newvm/UIWizardNewVMUnattendedPageBasic.h (modified) (3 diffs)

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

@@ -79 +79 @@
     return false;
 }
+
+void UIUserNamePasswordGroupBox::setLabelsVisible(bool fVisible)
+{
+    if (m_pUserNamePasswordEditor)
+        m_pUserNamePasswordEditor->setLabelsVisible(fVisible);
+}

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

@@ -57 +57 @@
        void setPassword(const QString &strPassword);
        bool isComplete();
+       void setLabelsVisible(bool fVisible);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -43 +43 @@
 #include "UIUserNamePasswordEditor.h"
 #include "UIWizardNewVM.h"
+#include "UIWizardNewVMEditors.h"
 #include "UIWizardNewVMPageExpert.h"
 
@@ -264 +265 @@
 
     // /* Connections for username, password, and hostname: */
-    // if (m_pUserNamePasswordEditor)
-    //     connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigSomeTextChanged,
+    // if (m_pUserNamePasswordGroupBox)
+    //     connect(m_pUserNamePasswordGroupBox, &UIUserNamePasswordEditor::sigSomeTextChanged,
     //             this, &UIWizardNewVMPageExpert::completeChanged);
     // if (m_pGAISOFilePathSelector)
@@ -402 +403 @@
     pLayout->setContentsMargins(0, 0, 0, 0);
     int iRow = 0;
-
-    /* Username selector: */
-    pLayout->addWidget(createUserNameWidgets(), iRow, 0, 1, 2);
+    m_pUserNamePasswordGroupBox = new UIUserNamePasswordGroupBox;
+    AssertReturn(m_pUserNamePasswordGroupBox, 0);
+    pLayout->addWidget(m_pUserNamePasswordGroupBox, iRow, 0, 1, 2);
 
     /* Additional options: */
@@ -520 +521 @@
     //         fIsComplete = false;
     //     }
-    //     if (m_pUserNamePasswordEditor)
-    //     {
-    //         if (!m_pUserNamePasswordEditor->isComplete())
+    //     if (m_pUserNamePasswordGroupBox)
+    //     {
+    //         if (!m_pUserNamePasswordGroupBox->isComplete())
     //         {
     //             m_pToolBox->setPageTitleIcon(ExpertToolboxItems_Unattended,
@@ -860 +861 @@
 }
 
-QWidget *UIWizardNewVMPageExpert::createUserNameWidgets()
-{
-    if (m_pUserNameContainer)
-        return m_pUserNameContainer;
-
-    m_pUserNameContainer = new QGroupBox;
-    QVBoxLayout *pUserNameContainerLayout = new QVBoxLayout(m_pUserNameContainer);
-    m_pUserNamePasswordEditor = new UIUserNamePasswordEditor;
-    AssertReturn(m_pUserNamePasswordEditor, 0);
-
-    m_pUserNamePasswordEditor->setLabelsVisible(true);
-    m_pUserNamePasswordEditor->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-    pUserNameContainerLayout->addWidget(m_pUserNamePasswordEditor);
-
-    return m_pUserNameContainer;
-}
-
 QWidget *UIWizardNewVMPageExpert::createAdditionalOptionsWidgets()
 {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.h

@@ -43 +43 @@
 class UINameAndSystemEditor;
 class UIToolBox;
-class UIUserNamePasswordEditor;
+class UIUserNamePasswordGroupBox;
 class QIToolButton;
 
@@ -114 +114 @@
                                                   CMediumFormat medFormat, bool fPreferred /* = false */);
     QWidget *createNameOSTypeWidgets();
-    QWidget *createUserNameWidgets();
     QWidget *createAdditionalOptionsWidgets();
     QWidget *createGAInstallWidgets();
@@ -152 +151 @@
     UIFilePathSelector *m_pGAISOFilePathSelector;
     QGroupBox *m_pUserNameContainer;
-    UIUserNamePasswordEditor *m_pUserNamePasswordEditor;
+    UIUserNamePasswordGroupBox *m_pUserNamePasswordGroupBox;
 
     /** @} */

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPageBasic.cpp

@@ -31 +31 @@
 #include "UIFilePathSelector.h"
 #include "UIIconPool.h"
-#include "UIUserNamePasswordEditor.h"
+#include "UIWizardNewVMEditors.h"
 #include "UIHostnameDomainNameEditor.h"
 #include "UIWizardNewVMUnattendedPageBasic.h"
@@ -57 +57 @@
 UIWizardNewVMUnattendedPageBasic::UIWizardNewVMUnattendedPageBasic()
     : m_pLabel(0)
-    , m_pUserNameContainer(0)
     , m_pAdditionalOptionsContainer(0)
     , m_pGAInstallationISOContainer(0)
     , m_pStartHeadlessCheckBox(0)
-    , m_pUserNamePasswordEditor(0)
+    , m_pUserNamePasswordGroupBox(0)
     , m_pHostnameDomainNameEditor(0)
     , m_pGAISOPathLabel(0)
@@ -78 +77 @@
     if (m_pLabel)
         pMainLayout->addWidget(m_pLabel, 0, 0, 1, 2);
-    pMainLayout->addWidget(createUserNameWidgets(), 1, 0, 1, 1);
+    m_pUserNamePasswordGroupBox = new UIUserNamePasswordGroupBox;
+    AssertReturnVoid(m_pUserNamePasswordGroupBox);
+    pMainLayout->addWidget(m_pUserNamePasswordGroupBox, 1, 0, 1, 1);
     pMainLayout->addWidget(createAdditionalOptionsWidgets(), 1, 1, 1, 1);
     pMainLayout->addWidget(createGAInstallWidgets(), 2, 0, 1, 2);
     pMainLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding), 3, 0, 1, 2);
 
-     createConnections();
+    createConnections();
 }
 
 void UIWizardNewVMUnattendedPageBasic::createConnections()
 {
-    if (m_pUserNamePasswordEditor)
-    {
-        connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigPasswordChanged,
+    if (m_pUserNamePasswordGroupBox)
+    {
+        connect(m_pUserNamePasswordGroupBox, &UIUserNamePasswordGroupBox::sigPasswordChanged,
                 this, &UIWizardNewVMUnattendedPageBasic::sltPasswordChanged);
-        connect(m_pUserNamePasswordEditor, &UIUserNamePasswordEditor::sigUserNameChanged,
+        connect(m_pUserNamePasswordGroupBox, &UIUserNamePasswordGroupBox::sigUserNameChanged,
                 this, &UIWizardNewVMUnattendedPageBasic::sltUserNameChanged);
     }
@@ -132 +133 @@
     if (m_pProductKeyLabel)
         m_pProductKeyLabel->setText(UIWizardNewVM::tr("&Product Key:"));
-    if (m_pUserNameContainer)
-        m_pUserNameContainer->setTitle(UIWizardNewVM::tr("Username and Password"));
+    if (m_pUserNamePasswordGroupBox)
+        m_pUserNamePasswordGroupBox->setTitle(UIWizardNewVM::tr("Username and Password"));
     if (m_pAdditionalOptionsContainer)
         m_pAdditionalOptionsContainer->setTitle(UIWizardNewVM::tr("Additional Options"));
@@ -154 +155 @@
     AssertReturnVoid(pWizard);
     /* Initialize user/password if they are not modified by the user: */
-    if (m_pUserNamePasswordEditor)
-    {
-        m_pUserNamePasswordEditor->blockSignals(true);
+    if (m_pUserNamePasswordGroupBox)
+    {
+        m_pUserNamePasswordGroupBox->blockSignals(true);
         if (!m_userModifiedParameters.contains("UserName"))
-            m_pUserNamePasswordEditor->setUserName(pWizard->userName());
+            m_pUserNamePasswordGroupBox->setUserName(pWizard->userName());
         if (!m_userModifiedParameters.contains("Password"))
-            m_pUserNamePasswordEditor->setPassword(pWizard->password());
-        m_pUserNamePasswordEditor->blockSignals(false);
+            m_pUserNamePasswordGroupBox->setPassword(pWizard->password());
+        m_pUserNamePasswordGroupBox->blockSignals(false);
     }
     if (m_pHostnameDomainNameEditor)
@@ -199 +200 @@
         !UIWizardNewVMUnattendedPage::checkGAISOFile(m_pGAISOFilePathSelector))
         return false;
-    if (m_pUserNamePasswordEditor && !m_pUserNamePasswordEditor->isComplete())
+    if (m_pUserNamePasswordGroupBox && !m_pUserNamePasswordGroupBox->isComplete())
         return false;
     if (m_pHostnameDomainNameEditor && !m_pHostnameDomainNameEditor->isComplete())
@@ -267 +268 @@
 {
     newVMWizardPropertySet(StartHeadless, fStartHeadless);
-}
-
-QWidget *UIWizardNewVMUnattendedPageBasic::createUserNameWidgets()
-{
-    if (m_pUserNameContainer)
-        return m_pUserNameContainer;
-
-    m_pUserNameContainer = new QGroupBox;
-    QVBoxLayout *pUserNameContainerLayout = new QVBoxLayout(m_pUserNameContainer);
-    m_pUserNamePasswordEditor = new UIUserNamePasswordEditor;
-    if (m_pUserNamePasswordEditor)
-    {
-        m_pUserNamePasswordEditor->setLabelsVisible(true);
-        m_pUserNamePasswordEditor->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-        pUserNameContainerLayout->addWidget(m_pUserNamePasswordEditor);
-    }
-    return m_pUserNameContainer;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMUnattendedPageBasic.h

@@ -34 +34 @@
 class QIRichTextLabel;
 class UIFilePathSelector;
-class UIUserNamePasswordEditor;
+class UIUserNamePasswordGroupBox;
 class UIHostnameDomainNameEditor;
 struct UIUnattendedInstallData;
@@ -73 +73 @@
     void prepare();
     void createConnections();
-    QWidget *createUserNameWidgets();
     QWidget *createAdditionalOptionsWidgets();
     QWidget *createGAInstallWidgets();
@@ -89 +88 @@
       * @{ */
         QIRichTextLabel *m_pLabel;
-        QGroupBox *m_pUserNameContainer;
         QGroupBox *m_pAdditionalOptionsContainer;
         QGroupBox *m_pGAInstallationISOContainer;
         QCheckBox *m_pStartHeadlessCheckBox;
-        UIUserNamePasswordEditor *m_pUserNamePasswordEditor;
+        UIUserNamePasswordGroupBox *m_pUserNamePasswordGroupBox;
         UIHostnameDomainNameEditor *m_pHostnameDomainNameEditor;
         QLabel    *m_pGAISOPathLabel;