Changeset 87348 in vbox

Timestamp:

Jan 21, 2021 12:09:05 PM (4 years ago)

Author:

vboxsync

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

142324

Message:

FE/Qt: bugref:9515. Redesigning unattended page

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIToolBox.cpp (modified) (9 diffs)
• widgets/UIUserNamePasswordEditor.cpp (modified) (4 diffs)
• widgets/UIUserNamePasswordEditor.h (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageBasic1.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVMPageBasic2.cpp (modified) (2 diffs)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (9 diffs)
• wizards/newvm/UIWizardNewVMPageExpert.h (modified) (3 diffs)

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

@@ -67 +67 @@
     int titleHeight() const;
     int pageWidgetHeight() const;
+    void setTitleIcon(const QIcon &icon);
 
 protected:
@@ -83 +84 @@
     QWidget     *m_pTitleContainerWidget;
     QLabel      *m_pTitleLabel;
+    QLabel      *m_pIconLabel;
     QCheckBox   *m_pEnableCheckBox;
 
@@ -98 +100 @@
     , m_pTitleContainerWidget(0)
     , m_pTitleLabel(0)
+    , m_pIconLabel(0)
     , m_pEnableCheckBox(0)
     , m_pWidget(0)
@@ -118 +121 @@
 
     m_pTitleContainerWidget = new QWidget;
+    m_pTitleContainerWidget->installEventFilter(this);
     QHBoxLayout *pTitleLayout = new QHBoxLayout(m_pTitleContainerWidget);
     pTitleLayout->setContentsMargins(qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin),
@@ -133 +137 @@
     m_pTitleLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
-    m_pTitleLabel->installEventFilter(this);
     pTitleLayout->addWidget(m_pTitleLabel);
+    m_pIconLabel = new QLabel;
+    pTitleLayout->addWidget(m_pIconLabel, Qt::AlignLeft);
+    pTitleLayout->addStretch();
     m_pTitleContainerWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
     m_pLayout->addWidget(m_pTitleContainerWidget);
@@ -183 +189 @@
 }
 
+void UIToolBoxPage::setTitleIcon(const QIcon &icon)
+{
+    if (!m_pIconLabel)
+        return;
+    if (icon.isNull())
+    {
+        m_pIconLabel->setPixmap(QPixmap());
+        return;
+    }
+    const int iMetricSmall = QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize);
+    m_pIconLabel->setPixmap(icon.pixmap(windowHandle(), QSize(iMetricSmall, iMetricSmall)));
+}
+
 int UIToolBoxPage::titleHeight() const
 {
@@ -199 +218 @@
 bool UIToolBoxPage::eventFilter(QObject *pWatched, QEvent *pEvent)
 {
-    if (pWatched == m_pTitleLabel && pEvent->type() == QEvent::MouseButtonPress)
-        emit sigShowPageWidget();
+    if (pWatched == m_pTitleContainerWidget)
+    {
+        if (pEvent->type() == QEvent::MouseButtonPress)
+            emit sigShowPageWidget();
+    }
     return QWidget::eventFilter(pWatched, pEvent);
 
@@ -237 +259 @@
 
     const QPalette pal = palette();
-    QColor tabBackgroundColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(110);
+    QColor tabBackgroundColor = pal.color(QPalette::Active, QPalette::Highlight).lighter(130);
     pNewPage->setTitleBackgroundColor(tabBackgroundColor);
 
@@ -278 +300 @@
 void UIToolBox::setItemIcon(int iIndex, const QIcon &icon)
 {
-    Q_UNUSED(iIndex);
-    Q_UNUSED(icon);
+    QMap<int, UIToolBoxPage*>::iterator iterator = m_pages.find(iIndex);
+    if (iterator == m_pages.end())
+        return;
+    iterator.value()->setTitleIcon(icon);
 }
 

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

@@ -120 +120 @@
     , m_pPasswordRepeatLabel(0)
     , m_fForceUnmark(false)
+    , m_fShowPlaceholderText(true)
+    , m_fLabelsVisible(true)
 {
     prepare();
@@ -188 +190 @@
 }
 
+void UIUserNamePasswordEditor::setPlaceholderTextEnabled(bool fEnabled)
+{
+    if (m_fShowPlaceholderText == fEnabled)
+        return;
+    m_fShowPlaceholderText = fEnabled;
+    retranslateUi();
+}
+
+void UIUserNamePasswordEditor::setLabelsVisible(bool fVisible)
+{
+    if (m_fLabelsVisible == fVisible)
+        return;
+    m_fLabelsVisible = fVisible;
+    m_pUserNameLabel->setVisible(fVisible);
+    m_pPasswordLabel->setVisible(fVisible);
+    m_pPasswordRepeatLabel->setVisible(fVisible);
+
+}
+
 void UIUserNamePasswordEditor::retranslateUi()
 {
+    QString strPassword = UIWizardNewVM::tr("Password:");
+    QString strRepeatPassword = UIWizardNewVM::tr("Repeat Password:");
+    QString strUsername = UIWizardNewVM::tr("Username:");
     if (m_pUserNameLabel)
     {
-        m_pUserNameLabel->setText(UIWizardNewVM::tr("User Name:"));
+        m_pUserNameLabel->setText(strUsername);
         m_pUserNameLabel->setToolTip(UIWizardNewVM::tr("Type the user name which will be used in attended install:"));
 
@@ -198 +222 @@
     if (m_pPasswordLabel)
     {
-        m_pPasswordLabel->setText(UIWizardNewVM::tr("Password:"));
+        m_pPasswordLabel->setText(strPassword);
         m_pPasswordLabel->setToolTip(UIWizardNewVM::tr("Type the password for the user name"));
 
@@ -204 +228 @@
     if (m_pPasswordRepeatLabel)
     {
-        m_pPasswordRepeatLabel->setText(UIWizardNewVM::tr("Repeat Password:"));
+        m_pPasswordRepeatLabel->setText(strRepeatPassword);
         m_pPasswordRepeatLabel->setToolTip(UIWizardNewVM::tr("Retype the password:"));
+    }
+
+    if (m_fShowPlaceholderText)
+    {
+        if(m_pUserNameLineEdit)
+            m_pUserNameLineEdit->setPlaceholderText(strUsername);
+        if (m_pPasswordLineEdit)
+            m_pPasswordLineEdit->setPlaceholderText(strPassword);
+        if (m_pPasswordRepeatLineEdit)
+            m_pPasswordRepeatLineEdit->setPlaceholderText(strRepeatPassword);
+    }
+    else
+    {
+        if(m_pUserNameLineEdit)
+            m_pUserNameLineEdit->setPlaceholderText(QString());
+        if (m_pPasswordLineEdit)
+            m_pPasswordLineEdit->setPlaceholderText(QString());
+        if (m_pPasswordRepeatLineEdit)
+            m_pPasswordRepeatLineEdit->setPlaceholderText(QString());
     }
 }

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

@@ -88 +88 @@
     void setForceUnmark(bool fForceUnmark);
 
+    /** When fEnabled true place holder texts for the line edits are shown. */
+    void setPlaceholderTextEnabled(bool fEnabled);
+    void setLabelsVisible(bool fVisible);
+
 protected:
 
@@ -118 +122 @@
     /** When true line edits are not marked even if they have to be. */
     bool m_fForceUnmark;
+    bool m_fShowPlaceholderText;
+    bool m_fLabelsVisible;
 };
 

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

@@ -448 +448 @@
 bool UIWizardNewVMPage1::isUnattendedEnabled() const
 {
-    if (m_pISOFilePathSelector)
-        return m_pISOFilePathSelector->isValid();
-    return false;
+    if (!m_pISOFilePathSelector)
+        return false;
+    const QString &strPath = m_pISOFilePathSelector->path();
+    if (strPath.isNull() || strPath.isEmpty())
+        return false;
+    return true;
 }
 

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

@@ -115 +115 @@
     QWidget *pContainer = new QWidget;
     QGridLayout *pGridLayout = new QGridLayout(pContainer);
+    pGridLayout->setContentsMargins(0, 0, 0, 0);
 
     m_pUserNamePasswordEditor = new UIUserNamePasswordEditor;
@@ -159 +160 @@
     QWidget *pContainer = new QWidget;
     QGridLayout *pGridLayout = new QGridLayout(pContainer);
-
+    pGridLayout->setContentsMargins(0, 0, 0, 0);
     m_pProductKeyLabel = new QLabel;
     m_pProductKeyLabel->setAlignment(Qt::AlignRight);

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

@@ -20 +20 @@
 #include <QCheckBox>
 #include <QGridLayout>
+#include <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
@@ -45 +46 @@
     : UIWizardNewVMPage1(strGroup)
     , m_pToolBox(0)
+    , m_pInstallationISOContainer(0)
+    , m_pUserNameContainer(0)
+    , m_pAdditionalOptionsContainer(0)
+    , m_pGAInstallationISOContainer(0)
 {
     /* Create widgets: */
@@ -181 +186 @@
 void UIWizardNewVMPageExpert::sltOSFamilyTypeChanged()
 {
-    if (m_pToolBox)
-        m_pToolBox->setItemEnabled(ExpertToolboxItems_ProductKey, isProductKeyWidgetEnabled());
+    disableEnableProductKeyWidgets(isProductKeyWidgetEnabled());
 }
 
@@ -190 +194 @@
     UIWizardNewVMPage2::retranslateWidgets();
     UIWizardNewVMPage3::retranslateWidgets();
-
+    if (m_pInstallationISOContainer)
+        m_pInstallationISOContainer->setTitle(UIWizardNewVM::tr("Installation medium (ISO)"));
+    if (m_pUserNameContainer)
+        m_pUserNameContainer->setTitle(UIWizardNewVM::tr("User name and password"));
+    if (m_pAdditionalOptionsContainer)
+        m_pAdditionalOptionsContainer->setTitle(UIWizardNewVM::tr("Additional options"));
+    if (m_pGAInstallationISOContainer)
+        m_pGAInstallationISOContainer->setTitle(UIWizardNewVM::tr("Guest Additions Installation Medium (ISO)"));
     if (m_pToolBox)
     {
         m_pToolBox->setItemText(ExpertToolboxItems_NameAndOSType, QString(UIWizardNewVM::tr("Name and operating system")));
-        m_pToolBox->setItemText(ExpertToolboxItems_UsernameHostname, UIWizardNewVM::tr("Username and hostname"));
         m_pToolBox->setItemText(ExpertToolboxItems_Unattended, UIWizardNewVM::tr("Unattended Install"));
-        m_pToolBox->setItemText(ExpertToolboxItems_GAInstall, UIWizardNewVM::tr("Guest additions install"));
-        m_pToolBox->setItemText(ExpertToolboxItems_ProductKey, UIWizardNewVM::tr("Product key"));
         m_pToolBox->setItemText(ExpertToolboxItems_Disk, UIWizardNewVM::tr("Hard disk"));
         m_pToolBox->setItemText(ExpertToolboxItems_Hardware, UIWizardNewVM::tr("Hardware"));
@@ -311 +319 @@
     int iRow = 0;
 
-    m_pISOSelectorLabel = new QLabel;
-    if (m_pISOSelectorLabel)
-    {
-        m_pISOSelectorLabel->setAlignment(Qt::AlignRight);
-        m_pISOSelectorLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
-        pLayout->addWidget(m_pISOSelectorLabel, iRow, 0, 1, 1);
-    }
-
-    m_pISOFilePathSelector = new UIFilePathSelector;
-    if (m_pISOFilePathSelector)
-    {
-        m_pISOFilePathSelector->setResetEnabled(false);
-        m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
-        m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
-        pLayout->addWidget(m_pISOFilePathSelector, iRow++, 1, 1, 4);
-    }
-
-    m_pStartHeadlessCheckBox = new QCheckBox;
-    if (m_pStartHeadlessCheckBox)
-        pLayout->addWidget(m_pStartHeadlessCheckBox, iRow++, 0, 1, 5);
-
-    pLayout->addWidget(createUserNameHostNameWidgets(), iRow, 0, 4, 5);
-    iRow += 4;
-    pLayout->addWidget(createGAInstallWidgets(), iRow, 0, 2, 5);
-    iRow += 2;
-    pLayout->addWidget(createProductKeyWidgets(), iRow, 0, 1, 5);
-
-
+    /* Installation medium selector etc: */
+    {
+        m_pInstallationISOContainer = new QGroupBox;
+        QHBoxLayout *pInstallationISOContainerLayout = new QHBoxLayout(m_pInstallationISOContainer);
+
+        m_pISOFilePathSelector = new UIFilePathSelector;
+        if (m_pISOFilePathSelector)
+        {
+            m_pISOFilePathSelector->setResetEnabled(false);
+            m_pISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
+            m_pISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
+            pInstallationISOContainerLayout->addWidget(m_pISOFilePathSelector);
+        }
+        pLayout->addWidget(m_pInstallationISOContainer, iRow++, 0, 1, 4);
+    }
+
+    /* Username selector: */
+    {
+        m_pUserNameContainer = new QGroupBox;
+        QVBoxLayout *pUserNameContainerLayout = new QVBoxLayout(m_pUserNameContainer);
+        m_pUserNamePasswordEditor = new UIUserNamePasswordEditor;
+        if (m_pUserNamePasswordEditor)
+        {
+            m_pUserNamePasswordEditor->setLabelsVisible(true);
+            pUserNameContainerLayout->addWidget(m_pUserNamePasswordEditor);
+        }
+        pLayout->addWidget(m_pUserNameContainer, iRow, 0, 1, 2);
+    }
+
+    /* Additional options: */
+    {
+        m_pAdditionalOptionsContainer = new QGroupBox;
+        QGridLayout *pAdditionalOptionsContainerLayout = new QGridLayout(m_pAdditionalOptionsContainer);
+        m_pStartHeadlessCheckBox = new QCheckBox;
+        if (m_pStartHeadlessCheckBox)
+            pAdditionalOptionsContainerLayout->addWidget(m_pStartHeadlessCheckBox, 0, 0, 1, 4);
+
+        m_pProductKeyLabel = new QLabel;
+        if (m_pProductKeyLabel)
+        {
+            m_pProductKeyLabel->setAlignment(Qt::AlignRight);
+            m_pProductKeyLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+            pAdditionalOptionsContainerLayout->addWidget(m_pProductKeyLabel, 1, 0, 1, 1);
+        }
+        m_pProductKeyLineEdit = new QLineEdit;
+        if (m_pProductKeyLineEdit)
+        {
+            m_pProductKeyLineEdit->setInputMask(">NNNNN-NNNNN-NNNNN-NNNNN-NNNNN;#");
+            pAdditionalOptionsContainerLayout->addWidget(m_pProductKeyLineEdit, 1, 1, 1, 3);
+        }
+
+        m_pHostnameLabel = new QLabel;
+        if (m_pHostnameLabel)
+        {
+            m_pHostnameLabel->setAlignment(Qt::AlignRight);
+            m_pHostnameLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+            pAdditionalOptionsContainerLayout->addWidget(m_pHostnameLabel, 2, 0, 1, 1);
+        }
+
+        m_pHostnameLineEdit = new QLineEdit;
+        if (m_pHostnameLineEdit)
+            pAdditionalOptionsContainerLayout->addWidget(m_pHostnameLineEdit, 2, 1, 1, 3);
+
+        // pAdditionalOptionsContainerLayout->addWidget(createHostNameWidgets());
+
+        // pAdditionalOptionsContainerLayout->addStretch();
+        pLayout->addWidget(m_pAdditionalOptionsContainer, iRow, 2, 1, 2);
+    }
+    ++iRow;
+    /* Guest additions installation: */
+    {
+        m_pGAInstallationISOContainer = new QGroupBox;
+        QHBoxLayout *pGAInstallationISOContainer = new QHBoxLayout(m_pGAInstallationISOContainer);
+        m_pGAISOFilePathSelector = new UIFilePathSelector;
+        {
+            m_pGAISOFilePathSelector->setResetEnabled(false);
+            m_pGAISOFilePathSelector->setMode(UIFilePathSelector::Mode_File_Open);
+            m_pGAISOFilePathSelector->setFileDialogFilters("*.iso *.ISO");
+            m_pGAISOFilePathSelector->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+            pGAInstallationISOContainer->addWidget(m_pGAISOFilePathSelector);
+        }
+        pLayout->addWidget(m_pGAInstallationISOContainer, iRow, 0, 1, 4);
+    }
     return pContainerWidget;
 }
@@ -347 +410 @@
     bool fIsComplete = true;
     m_pToolBox->setItemIcon(ExpertToolboxItems_NameAndOSType, QIcon());
+    m_pToolBox->setItemIcon(ExpertToolboxItems_Unattended, QIcon());
     m_pToolBox->setItemIcon(ExpertToolboxItems_Disk, QIcon());
     m_pToolBox->setItemIcon(ExpertToolboxItems_Hardware, QIcon());
-    m_pToolBox->setItemIcon(ExpertToolboxItems_UsernameHostname, QIcon());
-    m_pToolBox->setItemIcon(ExpertToolboxItems_GAInstall, QIcon());
-    m_pToolBox->setItemIcon(ExpertToolboxItems_ProductKey, QIcon());
 
     if (!UIWizardPage::isComplete())
@@ -370 +431 @@
     {
         /* Check the installation medium: */
-        // if (!isISOFileSelectorComplete())
-        // {
-        //     m_pToolBox->setItemIcon(ExpertToolboxItems_NameAndOSType,
-        //                             UIIconPool::iconSet(":/status_error_16px.png"));
-        //     fIsComplete = false;
-        // }
+        if (!isISOFileSelectorComplete())
+        {
+            m_pToolBox->setItemIcon(ExpertToolboxItems_Unattended,
+                                    UIIconPool::iconSet(":/status_error_16px.png"));
+            fIsComplete = false;
+        }
         /* Check the GA installation medium: */
         if (!checkGAISOFile())
         {
-            m_pToolBox->setItemIcon(ExpertToolboxItems_GAInstall,
-                                    UIIconPool::iconSet(":/status_error_16px.png"));
+            // m_pToolBox->setItemIcon(ExpertToolboxItems_Unattended,
+            //                         UIIconPool::iconSet(":/status_error_16px.png"));
             fIsComplete = false;
         }
@@ -387 +448 @@
             if (!m_pUserNamePasswordEditor->isComplete())
             {
-                m_pToolBox->setItemIcon(ExpertToolboxItems_UsernameHostname,
+                m_pToolBox->setItemIcon(ExpertToolboxItems_Unattended,
                                         UIIconPool::iconSet(":/status_error_16px.png"));
                 fIsComplete = false;
@@ -444 +505 @@
 void UIWizardNewVMPageExpert::disableEnableUnattendedRelatedWidgets(bool fEnabled)
 {
-    if (m_pStartHeadlessCheckBox)
-        m_pStartHeadlessCheckBox->setEnabled(fEnabled);
-}
+    if (m_pUserNameContainer)
+        m_pUserNameContainer->setEnabled(fEnabled);
+    if (m_pAdditionalOptionsContainer)
+        m_pAdditionalOptionsContainer->setEnabled(fEnabled);
+    if (m_pGAInstallationISOContainer)
+        m_pGAInstallationISOContainer->setEnabled(fEnabled);
+    disableEnableProductKeyWidgets(isProductKeyWidgetEnabled());
+}
+
+void UIWizardNewVMPageExpert::disableEnableProductKeyWidgets(bool fEnabled)
+{
+    if (m_pProductKeyLabel)
+        m_pProductKeyLabel->setEnabled(fEnabled);
+    if (m_pProductKeyLineEdit)
+        m_pProductKeyLineEdit->setEnabled(fEnabled);
+}

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

@@ -28 +28 @@
 
 /* Forward declarations: */
+class QGroupBox;
 class UIToolBox;
 
@@ -91 +92 @@
         ExpertToolboxItems_Disk,
         ExpertToolboxItems_Hardware,
-        ExpertToolboxItems_UsernameHostname,
-        ExpertToolboxItems_GAInstall,
-        ExpertToolboxItems_ProductKey
     };
     /** Translation stuff. */
@@ -109 +107 @@
     bool isProductKeyWidgetEnabled() const;
     void disableEnableUnattendedRelatedWidgets(bool fEnabled);
+    void disableEnableProductKeyWidgets(bool fEnabled);
     void markWidgets() const;
     QWidget *createUnattendedWidgets();
 
-
     UIToolBox  *m_pToolBox;
+    QGroupBox *m_pInstallationISOContainer;
+    QGroupBox *m_pUserNameContainer;
+    QGroupBox *m_pAdditionalOptionsContainer;
+    QGroupBox *m_pGAInstallationISOContainer;
 };