Changeset 84965 in vbox

Timestamp:

Jun 26, 2020 9:06:12 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Some fixes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

r84955	r84965
1898	1898	comUnattendedInstaller.SetPassword(unattendedData.m_strPassword);
1899	1899	comUnattendedInstaller.SetHostname(unattendedData.m_strHostname);
	1900	comUnattendedInstaller.SetProductKey(unattendedData.m_strProductKey);
	1901
1900	1902	comUnattendedInstaller.Prepare();
1901	1903	checkUnattendedInstallError(comUnattendedInstaller);

r84961	r84965
524	524	m_unattendedInstallData.m_strDetectedOSLanguages = getStringFieldValue("detectedOSLanguages");
525	525	m_unattendedInstallData.m_strDetectedOSHints = getStringFieldValue("detectedOSHints");
526
	526	m_unattendedInstallData.m_strProductKey = getStringFieldValue("productKey");
527	527
528	528	QVariant fieldValue = field("isUnattendedEnabled");

r84961	r84965
46	46	QString m_strDetectedOSLanguages;
47	47	QString m_strDetectedOSHints;
	48	QString m_strProductKey;
48	49	};
49	50

-              r84961
+              r84965
 /* Qt includes: */
-#include <QComboBox>
-#include <QCompleter>
-#include <QIntValidator>
 #include <QGridLayout>
-#include <QSpacerItem>
 #include <QLabel>
-#include <QSortFilterProxyModel>
-#include <QSpinBox>
-#include <QStringListModel>
 #include <QStyle>
 #include <QToolButton>
 …
 /* GUI includes: */
 #include "QIRichTextLabel.h"
-#include "UIBaseMemoryEditor.h"
-#include "UIBaseMemorySlider.h"
 #include "UICommon.h"
 #include "UIIconPool.h"
-#include "UIVirtualCPUEditor.h"
 #include "UIWizardNewVMPageBasicInstallSetup.h"
 #include "UIWizardNewVM.h"

-              r84961
+              r84965
 /* Qt includes: */
 #include <QComboBox>
-#include <QCompleter>
-#include <QIntValidator>
 #include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
 #include <QSpacerItem>
-#include <QLabel>
-#include <QSortFilterProxyModel>
-#include <QSpinBox>
-#include <QStringListModel>
-#include <QStyle>
-#include <QToolButton>
 #include <QVBoxLayout>
 /* GUI includes: */
 #include "QIRichTextLabel.h"
-#include "UIBaseMemoryEditor.h"
-#include "UIBaseMemorySlider.h"
-#include "UICommon.h"
 #include "UIIconPool.h"
-#include "UIVirtualCPUEditor.h"
 #include "UIWizardNewVMPageBasicProductKey.h"
 #include "UIWizardNewVM.h"
 …
 QString UIWizardNewVMPageProductKey::productKey() const
+{
     if (!m_pProductKeyLineEdit)
+    if (!m_pProductKeyLineEdit || !m_pProductKeyLineEdit->hasAcceptableInput())
         return QString();
     return m_pProductKeyLineEdit->text();
 …
             m_pHostnameLabel = new QLabel;
             m_pProductKeyLineEdit = new QLineEdit;
+            m_pProductKeyLineEdit->setInputMask(">NNNNN-NNNNN-NNNNN-NNNNN-NNNNN;#");
             pGridLayout->addWidget(m_pHostnameLabel, 3, 0, 1, 1, Qt::AlignRight);
             pGridLayout->addWidget(m_pProductKeyLineEdit, 3, 1, 1, 3);

-              r84961
+              r84965
 #endif
-/* Qt includes: */
-#include <QLineEdit>
-#include <QStringList>
-#include <QWidget>
 /* Local includes: */
 …
 /* Forward declarations: */
-class QGridLayout;
 class QLabel;
 class QSpinBox;
+class QLineEdit;
 class QIRichTextLabel;
-struct UIUnattendedInstallData;
 class UIWizardNewVMPageProductKey : public UIWizardPageBase

Note: See TracChangeset for help on using the changeset viewer.