Changeset 20568 in vbox

Timestamp:

Jun 14, 2009 8:52:22 PM (16 years ago)

Author:

vboxsync

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

48572

Message:

FE/Qt4: New Registration Dialog: Radio-buttons are now excluding depending line-edits.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxRegistrationDlg.h (modified) (1 diff)
• src/VBoxRegistrationDlg.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxRegistrationDlg.h

@@ -52 +52 @@
 private slots:
 
-    void tuneRadioButton (const QString &aNewText);
+    void radioButtonToggled();
 
     void accept();

trunk/src/VBox/Frontends/VirtualBox/src/VBoxRegistrationDlg.cpp

@@ -237 +237 @@
     mLeNewFirstName->setMaxLength (50);
 
-   mLeNewFirstName->setValidator (new QRegExpValidator (nameExp, this));
+    mLeNewFirstName->setValidator (new QRegExpValidator (nameExp, this));
 
     mLeNewLastName->setMaxLength (50);
@@ -264 +264 @@
              this, SLOT (revalidate (QIWidgetValidator *)));
 
-    connect (mRbOld, SIGNAL (toggled (bool)), mWvalReg, SLOT (revalidate()));
-    connect (mRbNew, SIGNAL (toggled (bool)), mWvalReg, SLOT (revalidate()));
-
-    connect (mLeOldEmail, SIGNAL (textEdited (const QString &)),
-             this, SLOT (tuneRadioButton (const QString &)));
-    connect (mLeOldPassword, SIGNAL (textEdited (const QString &)),
-             this, SLOT (tuneRadioButton (const QString &)));
-    connect (mLeNewFirstName, SIGNAL (textEdited (const QString &)),
-             this, SLOT (tuneRadioButton (const QString &)));
-    connect (mLeNewLastName, SIGNAL (textEdited (const QString &)),
-             this, SLOT (tuneRadioButton (const QString &)));
-    connect (mLeNewCompany, SIGNAL (textEdited (const QString &)),
-             this, SLOT (tuneRadioButton (const QString &)));
-    connect (mLeNewCountry, SIGNAL (textEdited (const QString &)),
-             this, SLOT (tuneRadioButton (const QString &)));
-    connect (mLeNewEmail, SIGNAL (textEdited (const QString &)),
-             this, SLOT (tuneRadioButton (const QString &)));
-    connect (mLeNewPassword, SIGNAL (textEdited (const QString &)),
-             this, SLOT (tuneRadioButton (const QString &)));
-    connect (mLeNewPassword2, SIGNAL (textEdited (const QString &)),
-             this, SLOT (tuneRadioButton (const QString &)));
+    connect (mRbOld, SIGNAL (toggled (bool)), this, SLOT (radioButtonToggled()));
+    connect (mRbNew, SIGNAL (toggled (bool)), this, SLOT (radioButtonToggled()));
 
     /* Setup other connections */
@@ -294 +275 @@
     mLeOldEmail->setText (data.account());
 
-    /* Update the next button state for pages with validation
-     * (validityChanged() connected to enableNext() will do the job) */
-    mWvalReg->revalidate();
+    radioButtonToggled();
 
     /* Initialize wizard hdr */
@@ -325 +304 @@
 }
 
-void VBoxRegistrationDlg::tuneRadioButton (const QString &aNewText)
-{
-    QList <QLineEdit*> oldSet;
-    oldSet << mLeOldEmail << mLeOldPassword;
-
-    QList <QLineEdit*> newSet;
-    newSet << mLeNewFirstName << mLeNewLastName
-           << mLeNewCompany << mLeNewCountry
-           << mLeNewEmail << mLeNewPassword << mLeNewPassword2;
-
-    QLineEdit *le = qobject_cast <QLineEdit*> (sender());
-
-    if (le && !aNewText.isEmpty() && oldSet.contains (le))
-        mRbOld->setChecked (true);
-    else if (le && !aNewText.isEmpty() && newSet.contains (le))
-        mRbNew->setChecked (true);
+void VBoxRegistrationDlg::radioButtonToggled()
+{
+    QRadioButton *current = mRbOld->isChecked() ? mRbOld : mRbNew;
+
+    mLeOldEmail->setEnabled (current == mRbOld);
+    mLeOldPassword->setEnabled (current == mRbOld);
+    mLeNewFirstName->setEnabled (current == mRbNew);
+    mLeNewLastName->setEnabled (current == mRbNew);
+    mLeNewCompany->setEnabled (current == mRbNew);
+    mLeNewCountry->setEnabled (current == mRbNew);
+    mLeNewEmail->setEnabled (current == mRbNew);
+    mLeNewPassword->setEnabled (current == mRbNew);
+    mLeNewPassword2->setEnabled (current == mRbNew);
 
     mWvalReg->revalidate();
@@ -395 +371 @@
 
     /* Enable control elements */
-    mLeOldEmail->setEnabled (true);
-    mLeOldPassword->setEnabled (true);
-    mLeNewFirstName->setEnabled (true);
-    mLeNewLastName->setEnabled (true);
-    mLeNewCompany->setEnabled (true);
-    mLeNewCountry->setEnabled (true);
-    mLeNewEmail->setEnabled (true);
-    mLeNewPassword->setEnabled (true);
-    mLeNewPassword2->setEnabled (true);
+    radioButtonToggled();
     finishButton()->setEnabled (true);
     cancelButton()->setEnabled (true);