Changeset 20619 in vbox

Timestamp:

Jun 16, 2009 10:26:16 AM (16 years ago)

Author:

vboxsync

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

48683

Message:

FE/Qt4: 3837: New registration method - Replacing countries text-field with combo-box.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -70 +70 @@
 private:
 
-    void postRequest (const QUrl &aUrl);
+    void populateCountries();
     void abortRequest (const QString &aReason);
     void finish();
 
-    bool isFieldValid (QLineEdit *aLe) const;
+    bool isFieldValid (QWidget *aWidget) const;
 
     VBoxRegistrationDlg **mSelf;

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

@@ -245 +245 @@
     mLeNewCompany->setValidator (new QRegExpValidator (nameExp, this));
 
-    mLeNewCountry->setMaxLength (50);
-    mLeNewCountry->setValidator (new QRegExpValidator (nameExp, this));
-
     mLeNewEmail->setMaxLength (50);
     mLeNewEmail->setValidator (new QRegExpValidator (emailExp, this));
@@ -256 +253 @@
     mLeNewPassword2->setMaxLength (20);
     mLeNewPassword2->setValidator (new QRegExpValidator (passwordExp, this));
+
+    populateCountries();
 
     /* Setup validation */
@@ -266 +265 @@
     connect (mRbOld, SIGNAL (toggled (bool)), this, SLOT (radioButtonToggled()));
     connect (mRbNew, SIGNAL (toggled (bool)), this, SLOT (radioButtonToggled()));
+    connect (mCbNewCountry, SIGNAL (currentIndexChanged (int)), mWvalReg, SLOT (revalidate()));
 
     /* Setup other connections */
@@ -302 +302 @@
     /* Translate uic generated strings */
     Ui::VBoxRegistrationDlg::retranslateUi (this);
+
+    /* Translate the first element of countries list */
+    mCbNewCountry->setItemText (0, tr ("Select Country/Territory"));
 }
 
@@ -313 +316 @@
     mLeNewLastName->setEnabled (current == mRbNew);
     mLeNewCompany->setEnabled (current == mRbNew);
-    mLeNewCountry->setEnabled (current == mRbNew);
+    mCbNewCountry->setEnabled (current == mRbNew);
     mLeNewEmail->setEnabled (current == mRbNew);
     mLeNewPassword->setEnabled (current == mRbNew);
@@ -330 +333 @@
     mLeNewLastName->setEnabled (false);
     mLeNewCompany->setEnabled (false);
-    mLeNewCountry->setEnabled (false);
+    mCbNewCountry->setEnabled (false);
     mLeNewEmail->setEnabled (false);
     mLeNewPassword->setEnabled (false);
@@ -434 +437 @@
         url.addQueryItem ("lastname", mLeNewLastName->text());
         url.addQueryItem ("company", mLeNewCompany->text());
-        url.addQueryItem ("country", mLeNewCountry->text());
+        url.addQueryItem ("country", mCbNewCountry->currentText());
     }
 
@@ -475 +478 @@
         /* Check for fields correctness */
         if (!isFieldValid (mLeNewFirstName) || !isFieldValid (mLeNewLastName) ||
-            !isFieldValid (mLeNewCompany) || !isFieldValid (mLeNewCountry) ||
+            !isFieldValid (mLeNewCompany) || !isFieldValid (mCbNewCountry) ||
             !isFieldValid (mLeNewEmail) ||
             !isFieldValid (mLeNewPassword) || !isFieldValid (mLeNewPassword2))
@@ -500 +503 @@
     Assert (mPageStack->currentWidget() == mPageReg);
     mLeOldEmail->setFocus();
+}
+
+void VBoxRegistrationDlg::populateCountries()
+{
+    QStringList list ("Empty");
+    list << "Afghanistan"
+         << "Albania"
+         << "Algeria"
+         << "American Samoa"
+         << "Andorra"
+         << "Angola"
+         << "Anguilla"
+         << "Antartica"
+         << "Antigua & Barbuda"
+         << "Argentina"
+         << "Armenia"
+         << "Aruba"
+         << "Ascension Island"
+         << "Australia"
+         << "Austria"
+         << "Azerbaijan"
+         << "Bahamas"
+         << "Bahrain"
+         << "Bangladesh"
+         << "Barbados"
+         << "Belarus"
+         << "Belgium"
+         << "Belize"
+         << "Benin"
+         << "Bermuda"
+         << "Bhutan"
+         << "Bolivia"
+         << "Bosnia and Herzegovina"
+         << "Botswana"
+         << "Bouvet Island"
+         << "Brazil"
+         << "British Indian Ocean Territory"
+         << "Brunei Darussalam"
+         << "Bulgaria"
+         << "Burkina Faso"
+         << "Burundi"
+         << "Cambodia"
+         << "Cameroon"
+         << "Canada"
+         << "Cape Verde"
+         << "Cayman Islands"
+         << "Central African Republic"
+         << "Chad"
+         << "Chile"
+         << "China"
+         << "Christmas Island"
+         << "Cocos (Keeling) Islands"
+         << "Colombia"
+         << "Comoros"
+         << "Congo, Democratic People's Republic"
+         << "Congo, Republic of"
+         << "Cook Islands"
+         << "Costa Rica"
+         << "Cote d'Ivoire"
+         << "Croatia/Hrvatska"
+         << "Cyprus"
+         << "Czech Republic"
+         << "Denmark"
+         << "Djibouti"
+         << "Dominica"
+         << "Dominican Republic"
+         << "East Timor"
+         << "Ecuador"
+         << "Egypt"
+         << "El Salvador"
+         << "Equatorial Guinea"
+         << "Eritrea"
+         << "Estonia"
+         << "Ethiopia"
+         << "Falkland Islands (Malvina)"
+         << "Faroe Islands"
+         << "Fiji"
+         << "Finland"
+         << "France"
+         << "French Guiana"
+         << "French Polynesia"
+         << "French Southern Territories"
+         << "Gabon"
+         << "Gambia"
+         << "Georgia"
+         << "Germany"
+         << "Ghana"
+         << "Gibraltar"
+         << "Greece"
+         << "Greenland"
+         << "Grenada"
+         << "Guadeloupe"
+         << "Guam"
+         << "Guatemala"
+         << "Guernsey"
+         << "Guinea"
+         << "Guinea-Bissau"
+         << "Guyana"
+         << "Haiti"
+         << "Heard and McDonald Islands"
+         << "Holy See (City Vatican State)"
+         << "Honduras"
+         << "Hong Kong"
+         << "Hungary"
+         << "Iceland"
+         << "India"
+         << "Indonesia"
+         << "Iraq"
+         << "Ireland"
+         << "Isle of Man"
+         << "Israel"
+         << "Italy"
+         << "Jamaica"
+         << "Japan"
+         << "Jersey"
+         << "Jordan"
+         << "Kazakhstan"
+         << "Kenya"
+         << "Kiribati"
+         << "Korea, Republic of"
+         << "Kuwait"
+         << "Kyrgyzstan"
+         << "Lao People's Democratic Republic"
+         << "Latvia"
+         << "Lebanon"
+         << "Lesotho"
+         << "Liberia"
+         << "Libyan Arab Jamahiriya"
+         << "Liechtenstein"
+         << "Lithuania"
+         << "Luxembourg"
+         << "Macau"
+         << "Macedonia, Former Yugoslav Republic"
+         << "Madagascar"
+         << "Malawi"
+         << "Malaysia"
+         << "Maldives"
+         << "Mali"
+         << "Malta"
+         << "Marshall Islands"
+         << "Martinique"
+         << "Mauritania"
+         << "Mauritius"
+         << "Mayotte"
+         << "Mexico"
+         << "Micronesia, Federal State of"
+         << "Moldova, Republic of"
+         << "Monaco"
+         << "Mongolia"
+         << "Montserrat"
+         << "Morocco"
+         << "Mozambique"
+         << "Namibia"
+         << "Nauru"
+         << "Nepal"
+         << "Netherlands"
+         << "Netherlands Antilles"
+         << "New Caledonia"
+         << "New Zealand"
+         << "Nicaragua"
+         << "Niger"
+         << "Nigeria"
+         << "Niue"
+         << "Norfolk Island"
+         << "Northern Mariana Island"
+         << "Norway"
+         << "Oman"
+         << "Pakistan"
+         << "Palau"
+         << "Panama"
+         << "Papua New Guinea"
+         << "Paraguay"
+         << "Peru"
+         << "Philippines"
+         << "Pitcairn Island"
+         << "Poland"
+         << "Portugal"
+         << "Puerto Rico"
+         << "Qatar"
+         << "Reunion Island"
+         << "Romania"
+         << "Russian Federation"
+         << "Rwanda"
+         << "Saint Kitts and Nevis"
+         << "Saint Lucia"
+         << "Saint Vincent and the Grenadines"
+         << "San Marino"
+         << "Sao Tome & Principe"
+         << "Saudi Arabia"
+         << "Senegal"
+         << "Seychelles"
+         << "Sierra Leone"
+         << "Singapore"
+         << "Slovak Republic"
+         << "Slovenia"
+         << "Solomon Islands"
+         << "Somalia"
+         << "South Africa"
+         << "South Georgia and the South Sandwich Islands"
+         << "Spain"
+         << "Sri Lanka"
+         << "St Pierre and Miquelon"
+         << "St. Helena"
+         << "Suriname"
+         << "Svalbard And Jan Mayen Island"
+         << "Swaziland"
+         << "Sweden"
+         << "Switzerland"
+         << "Taiwan"
+         << "Tajikistan"
+         << "Tanzania"
+         << "Thailand"
+         << "Togo"
+         << "Tokelau"
+         << "Tonga"
+         << "Trinidad and Tobago"
+         << "Tunisia"
+         << "Turkey"
+         << "Turkmenistan"
+         << "Turks and Ciacos Islands"
+         << "Tuvalu"
+         << "US Minor Outlying Islands"
+         << "Uganda"
+         << "Ukraine"
+         << "United Arab Emirates"
+         << "United Kingdom"
+         << "United States"
+         << "Uruguay"
+         << "Uzbekistan"
+         << "Vanuatu"
+         << "Venezuela"
+         << "Vietnam"
+         << "Virgin Island (British)"
+         << "Virgin Islands (USA)"
+         << "Wallis And Futuna Islands"
+         << "Western Sahara"
+         << "Western Samoa"
+         << "Yemen"
+         << "Yugoslavia"
+         << "Zambia"
+         << "Zimbabwe";
+    mCbNewCountry->addItems (list);
 }
 
@@ -527 +772 @@
 }
 
-bool VBoxRegistrationDlg::isFieldValid (QLineEdit *aLe) const
-{
-    QString text (aLe->text());
-    int position;
-    return aLe->validator()->validate (text, position) == QValidator::Acceptable;
-}
-
+bool VBoxRegistrationDlg::isFieldValid (QWidget *aWidget) const
+{
+    if (QLineEdit *le = qobject_cast <QLineEdit*> (aWidget))
+    {
+        QString text (le->text());
+        int position;
+        return le->validator()->validate (text, position) == QValidator::Acceptable;
+    }
+    else if (QComboBox *cb = qobject_cast <QComboBox*> (aWidget))
+    {
+        return cb->currentIndex() > 0;
+    }
+    return false;
+}
+

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

@@ -288 +288 @@
          </property>
          <property name="buddy" >
-          <cstring>mLeNewCountry</cstring>
+          <cstring>mCbNewCountry</cstring>
          </property>
         </widget>
        </item>
        <item row="12" column="3" >
-        <widget class="QLineEdit" name="mLeNewCountry" >
+        <widget class="QComboBox" name="mCbNewCountry" >
          <property name="whatsThis" >
           <string>Enter your full name using Latin characters.</string>