From 15998fb3e6c05d5e67c26a7a43a6ccb9e68af358 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 5 Jul 2015 21:13:39 +0200 Subject: [PATCH] Misc fixes --- cockatrice/src/dlg_edit_avatar.cpp | 4 +- cockatrice/src/dlg_edit_password.cpp | 27 ++- cockatrice/src/dlg_edit_password.h | 4 +- cockatrice/src/dlg_edit_user.cpp | 271 ++------------------------- cockatrice/src/dlg_register.cpp | 261 +------------------------- cockatrice/src/settingscache.cpp | 32 ++++ cockatrice/src/settingscache.h | 2 + common/server_database_interface.h | 2 +- 8 files changed, 84 insertions(+), 519 deletions(-) diff --git a/cockatrice/src/dlg_edit_avatar.cpp b/cockatrice/src/dlg_edit_avatar.cpp index 89d3e5fe..3c5fe1fa 100644 --- a/cockatrice/src/dlg_edit_avatar.cpp +++ b/cockatrice/src/dlg_edit_avatar.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -17,7 +18,7 @@ DlgEditAvatar::DlgEditAvatar(QWidget *parent) imageLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); imageLabel->setStyleSheet("border: 1px solid #000"); - textLabel = new QLabel(tr("To change your avatar, choose a new image.\nTo remove your current avatar, just confirm without choosing a new image.")); + textLabel = new QLabel(tr("To change your avatar, choose a new image.\nTo remove your current avatar, confirm without choosing a new image.")); browseButton = new QPushButton(tr("Browse...")); connect(browseButton, SIGNAL(clicked()), this, SLOT(actBrowse())); @@ -65,6 +66,7 @@ void DlgEditAvatar::actBrowse() imgReader.setFileName(fileName); if(!imgReader.read(&image)) { + qDebug() << "Avatar image loading failed for file:" << fileName; imageLabel->setText(tr("Invalid image chosen.")); return; } diff --git a/cockatrice/src/dlg_edit_password.cpp b/cockatrice/src/dlg_edit_password.cpp index e6992f0a..729b8974 100644 --- a/cockatrice/src/dlg_edit_password.cpp +++ b/cockatrice/src/dlg_edit_password.cpp @@ -1,9 +1,9 @@ -#include -#include +#include #include #include -#include -#include +#include +#include +#include #include "dlg_edit_password.h" @@ -14,7 +14,11 @@ DlgEditPassword::DlgEditPassword(QWidget *parent) settings.beginGroup("server"); oldPasswordLabel = new QLabel(tr("Old password:")); - oldPasswordEdit = new QLineEdit(settings.value("password").toString()); + oldPasswordEdit = new QLineEdit(); + + if(settings.value("save_password", 1).toInt()) + oldPasswordEdit->setText(settings.value("password").toString()); + oldPasswordLabel->setBuddy(oldPasswordEdit); oldPasswordEdit->setEchoMode(QLineEdit::Password); @@ -22,12 +26,19 @@ DlgEditPassword::DlgEditPassword(QWidget *parent) newPasswordEdit = new QLineEdit(); newPasswordLabel->setBuddy(newPasswordLabel); newPasswordEdit->setEchoMode(QLineEdit::Password); + + newPasswordLabel2 = new QLabel(tr("Confirm new password:")); + newPasswordEdit2 = new QLineEdit(); + newPasswordLabel2->setBuddy(newPasswordLabel2); + newPasswordEdit2->setEchoMode(QLineEdit::Password); QGridLayout *grid = new QGridLayout; grid->addWidget(oldPasswordLabel, 0, 0); grid->addWidget(oldPasswordEdit, 0, 1); grid->addWidget(newPasswordLabel, 1, 0); grid->addWidget(newPasswordEdit, 1, 1); + grid->addWidget(newPasswordLabel2, 2, 0); + grid->addWidget(newPasswordEdit2, 2, 1); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); connect(buttonBox, SIGNAL(accepted()), this, SLOT(actOk())); @@ -45,6 +56,12 @@ DlgEditPassword::DlgEditPassword(QWidget *parent) void DlgEditPassword::actOk() { + if(newPasswordEdit->text() != newPasswordEdit2->text()) + { + QMessageBox::warning(this, tr("Error"), tr("The new passwords don't match.")); + return; + } + QSettings settings; settings.beginGroup("server"); // always save the password so it will be picked up by the connect dialog diff --git a/cockatrice/src/dlg_edit_password.h b/cockatrice/src/dlg_edit_password.h index 9a2e6ec0..ba1bd202 100644 --- a/cockatrice/src/dlg_edit_password.h +++ b/cockatrice/src/dlg_edit_password.h @@ -19,8 +19,8 @@ private slots: void actOk(); void actCancel(); private: - QLabel *oldPasswordLabel, *newPasswordLabel; - QLineEdit *oldPasswordEdit, *newPasswordEdit; + QLabel *oldPasswordLabel, *newPasswordLabel, *newPasswordLabel2; + QLineEdit *oldPasswordEdit, *newPasswordEdit, *newPasswordEdit2; }; #endif diff --git a/cockatrice/src/dlg_edit_user.cpp b/cockatrice/src/dlg_edit_user.cpp index 74b2d4fd..2edb5778 100644 --- a/cockatrice/src/dlg_edit_user.cpp +++ b/cockatrice/src/dlg_edit_user.cpp @@ -6,6 +6,7 @@ #include #include "dlg_edit_user.h" +#include "settingscache.h" DlgEditUser::DlgEditUser(QWidget *parent, QString email, int gender, QString country, QString realName) : QDialog(parent) @@ -18,272 +19,26 @@ DlgEditUser::DlgEditUser(QWidget *parent, QString email, int gender, QString cou genderLabel = new QLabel(tr("Gender:")); genderEdit = new QComboBox(); genderLabel->setBuddy(genderEdit); - genderEdit->insertItem(0, QIcon(":/resources/genders/unknown.svg"), tr("Undefined")); - genderEdit->insertItem(1, QIcon(":/resources/genders/male.svg"), tr("Male")); - genderEdit->insertItem(2, QIcon(":/resources/genders/female.svg"), tr("Female")); + genderEdit->insertItem(0, QIcon(":/resources/genders/unknown.svg"), tr("Neutral")); + genderEdit->insertItem(1, QIcon(":/resources/genders/male.svg"), tr("Masculine")); + genderEdit->insertItem(2, QIcon(":/resources/genders/female.svg"), tr("Feminine")); genderEdit->setCurrentIndex(gender + 1); countryLabel = new QLabel(tr("Country:")); countryEdit = new QComboBox(); countryLabel->setBuddy(countryEdit); countryEdit->insertItem(0, tr("Undefined")); - countryEdit->addItem(QPixmap(":/resources/countries/ad.svg"), "ad"); - countryEdit->addItem(QIcon(":/resources/countries/ae.svg"), "ae"); - countryEdit->addItem(QIcon(":/resources/countries/af.svg"), "af"); - countryEdit->addItem(QIcon(":/resources/countries/ag.svg"), "ag"); - countryEdit->addItem(QIcon(":/resources/countries/ai.svg"), "ai"); - countryEdit->addItem(QIcon(":/resources/countries/al.svg"), "al"); - countryEdit->addItem(QIcon(":/resources/countries/am.svg"), "am"); - countryEdit->addItem(QIcon(":/resources/countries/ao.svg"), "ao"); - countryEdit->addItem(QIcon(":/resources/countries/aq.svg"), "aq"); - countryEdit->addItem(QIcon(":/resources/countries/ar.svg"), "ar"); - countryEdit->addItem(QIcon(":/resources/countries/as.svg"), "as"); - countryEdit->addItem(QIcon(":/resources/countries/at.svg"), "at"); - countryEdit->addItem(QIcon(":/resources/countries/au.svg"), "au"); - countryEdit->addItem(QIcon(":/resources/countries/aw.svg"), "aw"); - countryEdit->addItem(QIcon(":/resources/countries/ax.svg"), "ax"); - countryEdit->addItem(QIcon(":/resources/countries/az.svg"), "az"); - countryEdit->addItem(QIcon(":/resources/countries/ba.svg"), "ba"); - countryEdit->addItem(QIcon(":/resources/countries/bb.svg"), "bb"); - countryEdit->addItem(QIcon(":/resources/countries/bd.svg"), "bd"); - countryEdit->addItem(QIcon(":/resources/countries/be.svg"), "be"); - countryEdit->addItem(QIcon(":/resources/countries/bf.svg"), "bf"); - countryEdit->addItem(QIcon(":/resources/countries/bg.svg"), "bg"); - countryEdit->addItem(QIcon(":/resources/countries/bh.svg"), "bh"); - countryEdit->addItem(QIcon(":/resources/countries/bi.svg"), "bi"); - countryEdit->addItem(QIcon(":/resources/countries/bj.svg"), "bj"); - countryEdit->addItem(QIcon(":/resources/countries/bl.svg"), "bl"); - countryEdit->addItem(QIcon(":/resources/countries/bm.svg"), "bm"); - countryEdit->addItem(QIcon(":/resources/countries/bn.svg"), "bn"); - countryEdit->addItem(QIcon(":/resources/countries/bo.svg"), "bo"); - countryEdit->addItem(QIcon(":/resources/countries/bq.svg"), "bq"); - countryEdit->addItem(QIcon(":/resources/countries/br.svg"), "br"); - countryEdit->addItem(QIcon(":/resources/countries/bs.svg"), "bs"); - countryEdit->addItem(QIcon(":/resources/countries/bt.svg"), "bt"); - countryEdit->addItem(QIcon(":/resources/countries/bv.svg"), "bv"); - countryEdit->addItem(QIcon(":/resources/countries/bw.svg"), "bw"); - countryEdit->addItem(QIcon(":/resources/countries/by.svg"), "by"); - countryEdit->addItem(QIcon(":/resources/countries/bz.svg"), "bz"); - countryEdit->addItem(QIcon(":/resources/countries/ca.svg"), "ca"); - countryEdit->addItem(QIcon(":/resources/countries/cc.svg"), "cc"); - countryEdit->addItem(QIcon(":/resources/countries/cd.svg"), "cd"); - countryEdit->addItem(QIcon(":/resources/countries/cf.svg"), "cf"); - countryEdit->addItem(QIcon(":/resources/countries/cg.svg"), "cg"); - countryEdit->addItem(QIcon(":/resources/countries/ch.svg"), "ch"); - countryEdit->addItem(QIcon(":/resources/countries/ci.svg"), "ci"); - countryEdit->addItem(QIcon(":/resources/countries/ck.svg"), "ck"); - countryEdit->addItem(QIcon(":/resources/countries/cl.svg"), "cl"); - countryEdit->addItem(QIcon(":/resources/countries/cm.svg"), "cm"); - countryEdit->addItem(QIcon(":/resources/countries/cn.svg"), "cn"); - countryEdit->addItem(QIcon(":/resources/countries/co.svg"), "co"); - countryEdit->addItem(QIcon(":/resources/countries/cr.svg"), "cr"); - countryEdit->addItem(QIcon(":/resources/countries/cu.svg"), "cu"); - countryEdit->addItem(QIcon(":/resources/countries/cv.svg"), "cv"); - countryEdit->addItem(QIcon(":/resources/countries/cw.svg"), "cw"); - countryEdit->addItem(QIcon(":/resources/countries/cx.svg"), "cx"); - countryEdit->addItem(QIcon(":/resources/countries/cy.svg"), "cy"); - countryEdit->addItem(QIcon(":/resources/countries/cz.svg"), "cz"); - countryEdit->addItem(QIcon(":/resources/countries/de.svg"), "de"); - countryEdit->addItem(QIcon(":/resources/countries/dj.svg"), "dj"); - countryEdit->addItem(QIcon(":/resources/countries/dk.svg"), "dk"); - countryEdit->addItem(QIcon(":/resources/countries/dm.svg"), "dm"); - countryEdit->addItem(QIcon(":/resources/countries/do.svg"), "do"); - countryEdit->addItem(QIcon(":/resources/countries/dz.svg"), "dz"); - countryEdit->addItem(QIcon(":/resources/countries/ec.svg"), "ec"); - countryEdit->addItem(QIcon(":/resources/countries/ee.svg"), "ee"); - countryEdit->addItem(QIcon(":/resources/countries/eg.svg"), "eg"); - countryEdit->addItem(QIcon(":/resources/countries/eh.svg"), "eh"); - countryEdit->addItem(QIcon(":/resources/countries/er.svg"), "er"); - countryEdit->addItem(QIcon(":/resources/countries/es.svg"), "es"); - countryEdit->addItem(QIcon(":/resources/countries/et.svg"), "et"); - countryEdit->addItem(QIcon(":/resources/countries/fi.svg"), "fi"); - countryEdit->addItem(QIcon(":/resources/countries/fj.svg"), "fj"); - countryEdit->addItem(QIcon(":/resources/countries/fk.svg"), "fk"); - countryEdit->addItem(QIcon(":/resources/countries/fm.svg"), "fm"); - countryEdit->addItem(QIcon(":/resources/countries/fo.svg"), "fo"); - countryEdit->addItem(QIcon(":/resources/countries/fr.svg"), "fr"); - countryEdit->addItem(QIcon(":/resources/countries/ga.svg"), "ga"); - countryEdit->addItem(QIcon(":/resources/countries/gb.svg"), "gb"); - countryEdit->addItem(QIcon(":/resources/countries/gd.svg"), "gd"); - countryEdit->addItem(QIcon(":/resources/countries/ge.svg"), "ge"); - countryEdit->addItem(QIcon(":/resources/countries/gf.svg"), "gf"); - countryEdit->addItem(QIcon(":/resources/countries/gg.svg"), "gg"); - countryEdit->addItem(QIcon(":/resources/countries/gh.svg"), "gh"); - countryEdit->addItem(QIcon(":/resources/countries/gi.svg"), "gi"); - countryEdit->addItem(QIcon(":/resources/countries/gl.svg"), "gl"); - countryEdit->addItem(QIcon(":/resources/countries/gm.svg"), "gm"); - countryEdit->addItem(QIcon(":/resources/countries/gn.svg"), "gn"); - countryEdit->addItem(QIcon(":/resources/countries/gp.svg"), "gp"); - countryEdit->addItem(QIcon(":/resources/countries/gq.svg"), "gq"); - countryEdit->addItem(QIcon(":/resources/countries/gr.svg"), "gr"); - countryEdit->addItem(QIcon(":/resources/countries/gs.svg"), "gs"); - countryEdit->addItem(QIcon(":/resources/countries/gt.svg"), "gt"); - countryEdit->addItem(QIcon(":/resources/countries/gu.svg"), "gu"); - countryEdit->addItem(QIcon(":/resources/countries/gw.svg"), "gw"); - countryEdit->addItem(QIcon(":/resources/countries/gy.svg"), "gy"); - countryEdit->addItem(QIcon(":/resources/countries/hk.svg"), "hk"); - countryEdit->addItem(QIcon(":/resources/countries/hm.svg"), "hm"); - countryEdit->addItem(QIcon(":/resources/countries/hn.svg"), "hn"); - countryEdit->addItem(QIcon(":/resources/countries/hr.svg"), "hr"); - countryEdit->addItem(QIcon(":/resources/countries/ht.svg"), "ht"); - countryEdit->addItem(QIcon(":/resources/countries/hu.svg"), "hu"); - countryEdit->addItem(QIcon(":/resources/countries/id.svg"), "id"); - countryEdit->addItem(QIcon(":/resources/countries/ie.svg"), "ie"); - countryEdit->addItem(QIcon(":/resources/countries/il.svg"), "il"); - countryEdit->addItem(QIcon(":/resources/countries/im.svg"), "im"); - countryEdit->addItem(QIcon(":/resources/countries/in.svg"), "in"); - countryEdit->addItem(QIcon(":/resources/countries/io.svg"), "io"); - countryEdit->addItem(QIcon(":/resources/countries/iq.svg"), "iq"); - countryEdit->addItem(QIcon(":/resources/countries/ir.svg"), "ir"); - countryEdit->addItem(QIcon(":/resources/countries/is.svg"), "is"); - countryEdit->addItem(QIcon(":/resources/countries/it.svg"), "it"); - countryEdit->addItem(QIcon(":/resources/countries/je.svg"), "je"); - countryEdit->addItem(QIcon(":/resources/countries/jm.svg"), "jm"); - countryEdit->addItem(QIcon(":/resources/countries/jo.svg"), "jo"); - countryEdit->addItem(QIcon(":/resources/countries/jp.svg"), "jp"); - countryEdit->addItem(QIcon(":/resources/countries/ke.svg"), "ke"); - countryEdit->addItem(QIcon(":/resources/countries/kg.svg"), "kg"); - countryEdit->addItem(QIcon(":/resources/countries/kh.svg"), "kh"); - countryEdit->addItem(QIcon(":/resources/countries/ki.svg"), "ki"); - countryEdit->addItem(QIcon(":/resources/countries/km.svg"), "km"); - countryEdit->addItem(QIcon(":/resources/countries/kn.svg"), "kn"); - countryEdit->addItem(QIcon(":/resources/countries/kp.svg"), "kp"); - countryEdit->addItem(QIcon(":/resources/countries/kr.svg"), "kr"); - countryEdit->addItem(QIcon(":/resources/countries/kw.svg"), "kw"); - countryEdit->addItem(QIcon(":/resources/countries/ky.svg"), "ky"); - countryEdit->addItem(QIcon(":/resources/countries/kz.svg"), "kz"); - countryEdit->addItem(QIcon(":/resources/countries/la.svg"), "la"); - countryEdit->addItem(QIcon(":/resources/countries/lb.svg"), "lb"); - countryEdit->addItem(QIcon(":/resources/countries/lc.svg"), "lc"); - countryEdit->addItem(QIcon(":/resources/countries/li.svg"), "li"); - countryEdit->addItem(QIcon(":/resources/countries/lk.svg"), "lk"); - countryEdit->addItem(QIcon(":/resources/countries/lr.svg"), "lr"); - countryEdit->addItem(QIcon(":/resources/countries/ls.svg"), "ls"); - countryEdit->addItem(QIcon(":/resources/countries/lt.svg"), "lt"); - countryEdit->addItem(QIcon(":/resources/countries/lu.svg"), "lu"); - countryEdit->addItem(QIcon(":/resources/countries/lv.svg"), "lv"); - countryEdit->addItem(QIcon(":/resources/countries/ly.svg"), "ly"); - countryEdit->addItem(QIcon(":/resources/countries/ma.svg"), "ma"); - countryEdit->addItem(QIcon(":/resources/countries/mc.svg"), "mc"); - countryEdit->addItem(QIcon(":/resources/countries/md.svg"), "md"); - countryEdit->addItem(QIcon(":/resources/countries/me.svg"), "me"); - countryEdit->addItem(QIcon(":/resources/countries/mf.svg"), "mf"); - countryEdit->addItem(QIcon(":/resources/countries/mg.svg"), "mg"); - countryEdit->addItem(QIcon(":/resources/countries/mh.svg"), "mh"); - countryEdit->addItem(QIcon(":/resources/countries/mk.svg"), "mk"); - countryEdit->addItem(QIcon(":/resources/countries/ml.svg"), "ml"); - countryEdit->addItem(QIcon(":/resources/countries/mm.svg"), "mm"); - countryEdit->addItem(QIcon(":/resources/countries/mn.svg"), "mn"); - countryEdit->addItem(QIcon(":/resources/countries/mo.svg"), "mo"); - countryEdit->addItem(QIcon(":/resources/countries/mp.svg"), "mp"); - countryEdit->addItem(QIcon(":/resources/countries/mq.svg"), "mq"); - countryEdit->addItem(QIcon(":/resources/countries/mr.svg"), "mr"); - countryEdit->addItem(QIcon(":/resources/countries/ms.svg"), "ms"); - countryEdit->addItem(QIcon(":/resources/countries/mt.svg"), "mt"); - countryEdit->addItem(QIcon(":/resources/countries/mu.svg"), "mu"); - countryEdit->addItem(QIcon(":/resources/countries/mv.svg"), "mv"); - countryEdit->addItem(QIcon(":/resources/countries/mw.svg"), "mw"); - countryEdit->addItem(QIcon(":/resources/countries/mx.svg"), "mx"); - countryEdit->addItem(QIcon(":/resources/countries/my.svg"), "my"); - countryEdit->addItem(QIcon(":/resources/countries/mz.svg"), "mz"); - countryEdit->addItem(QIcon(":/resources/countries/na.svg"), "na"); - countryEdit->addItem(QIcon(":/resources/countries/nc.svg"), "nc"); - countryEdit->addItem(QIcon(":/resources/countries/ne.svg"), "ne"); - countryEdit->addItem(QIcon(":/resources/countries/nf.svg"), "nf"); - countryEdit->addItem(QIcon(":/resources/countries/ng.svg"), "ng"); - countryEdit->addItem(QIcon(":/resources/countries/ni.svg"), "ni"); - countryEdit->addItem(QIcon(":/resources/countries/nl.svg"), "nl"); - countryEdit->addItem(QIcon(":/resources/countries/no.svg"), "no"); - countryEdit->addItem(QIcon(":/resources/countries/np.svg"), "np"); - countryEdit->addItem(QIcon(":/resources/countries/nr.svg"), "nr"); - countryEdit->addItem(QIcon(":/resources/countries/nu.svg"), "nu"); - countryEdit->addItem(QIcon(":/resources/countries/nz.svg"), "nz"); - countryEdit->addItem(QIcon(":/resources/countries/om.svg"), "om"); - countryEdit->addItem(QIcon(":/resources/countries/pa.svg"), "pa"); - countryEdit->addItem(QIcon(":/resources/countries/pe.svg"), "pe"); - countryEdit->addItem(QIcon(":/resources/countries/pf.svg"), "pf"); - countryEdit->addItem(QIcon(":/resources/countries/pg.svg"), "pg"); - countryEdit->addItem(QIcon(":/resources/countries/ph.svg"), "ph"); - countryEdit->addItem(QIcon(":/resources/countries/pk.svg"), "pk"); - countryEdit->addItem(QIcon(":/resources/countries/pl.svg"), "pl"); - countryEdit->addItem(QIcon(":/resources/countries/pm.svg"), "pm"); - countryEdit->addItem(QIcon(":/resources/countries/pn.svg"), "pn"); - countryEdit->addItem(QIcon(":/resources/countries/pr.svg"), "pr"); - countryEdit->addItem(QIcon(":/resources/countries/ps.svg"), "ps"); - countryEdit->addItem(QIcon(":/resources/countries/pt.svg"), "pt"); - countryEdit->addItem(QIcon(":/resources/countries/pw.svg"), "pw"); - countryEdit->addItem(QIcon(":/resources/countries/py.svg"), "py"); - countryEdit->addItem(QIcon(":/resources/countries/qa.svg"), "qa"); - countryEdit->addItem(QIcon(":/resources/countries/re.svg"), "re"); - countryEdit->addItem(QIcon(":/resources/countries/ro.svg"), "ro"); - countryEdit->addItem(QIcon(":/resources/countries/rs.svg"), "rs"); - countryEdit->addItem(QIcon(":/resources/countries/ru.svg"), "ru"); - countryEdit->addItem(QIcon(":/resources/countries/rw.svg"), "rw"); - countryEdit->addItem(QIcon(":/resources/countries/sa.svg"), "sa"); - countryEdit->addItem(QIcon(":/resources/countries/sb.svg"), "sb"); - countryEdit->addItem(QIcon(":/resources/countries/sc.svg"), "sc"); - countryEdit->addItem(QIcon(":/resources/countries/sd.svg"), "sd"); - countryEdit->addItem(QIcon(":/resources/countries/se.svg"), "se"); - countryEdit->addItem(QIcon(":/resources/countries/sg.svg"), "sg"); - countryEdit->addItem(QIcon(":/resources/countries/sh.svg"), "sh"); - countryEdit->addItem(QIcon(":/resources/countries/si.svg"), "si"); - countryEdit->addItem(QIcon(":/resources/countries/sj.svg"), "sj"); - countryEdit->addItem(QIcon(":/resources/countries/sk.svg"), "sk"); - countryEdit->addItem(QIcon(":/resources/countries/sl.svg"), "sl"); - countryEdit->addItem(QIcon(":/resources/countries/sm.svg"), "sm"); - countryEdit->addItem(QIcon(":/resources/countries/sn.svg"), "sn"); - countryEdit->addItem(QIcon(":/resources/countries/so.svg"), "so"); - countryEdit->addItem(QIcon(":/resources/countries/sr.svg"), "sr"); - countryEdit->addItem(QIcon(":/resources/countries/ss.svg"), "ss"); - countryEdit->addItem(QIcon(":/resources/countries/st.svg"), "st"); - countryEdit->addItem(QIcon(":/resources/countries/sv.svg"), "sv"); - countryEdit->addItem(QIcon(":/resources/countries/sx.svg"), "sx"); - countryEdit->addItem(QIcon(":/resources/countries/sy.svg"), "sy"); - countryEdit->addItem(QIcon(":/resources/countries/sz.svg"), "sz"); - countryEdit->addItem(QIcon(":/resources/countries/tc.svg"), "tc"); - countryEdit->addItem(QIcon(":/resources/countries/td.svg"), "td"); - countryEdit->addItem(QIcon(":/resources/countries/tf.svg"), "tf"); - countryEdit->addItem(QIcon(":/resources/countries/tg.svg"), "tg"); - countryEdit->addItem(QIcon(":/resources/countries/th.svg"), "th"); - countryEdit->addItem(QIcon(":/resources/countries/tj.svg"), "tj"); - countryEdit->addItem(QIcon(":/resources/countries/tk.svg"), "tk"); - countryEdit->addItem(QIcon(":/resources/countries/tl.svg"), "tl"); - countryEdit->addItem(QIcon(":/resources/countries/tm.svg"), "tm"); - countryEdit->addItem(QIcon(":/resources/countries/tn.svg"), "tn"); - countryEdit->addItem(QIcon(":/resources/countries/to.svg"), "to"); - countryEdit->addItem(QIcon(":/resources/countries/tr.svg"), "tr"); - countryEdit->addItem(QIcon(":/resources/countries/tt.svg"), "tt"); - countryEdit->addItem(QIcon(":/resources/countries/tv.svg"), "tv"); - countryEdit->addItem(QIcon(":/resources/countries/tw.svg"), "tw"); - countryEdit->addItem(QIcon(":/resources/countries/tz.svg"), "tz"); - countryEdit->addItem(QIcon(":/resources/countries/ua.svg"), "ua"); - countryEdit->addItem(QIcon(":/resources/countries/ug.svg"), "ug"); - countryEdit->addItem(QIcon(":/resources/countries/um.svg"), "um"); - countryEdit->addItem(QIcon(":/resources/countries/us.svg"), "us"); - countryEdit->addItem(QIcon(":/resources/countries/uy.svg"), "uy"); - countryEdit->addItem(QIcon(":/resources/countries/uz.svg"), "uz"); - countryEdit->addItem(QIcon(":/resources/countries/va.svg"), "va"); - countryEdit->addItem(QIcon(":/resources/countries/vc.svg"), "vc"); - countryEdit->addItem(QIcon(":/resources/countries/ve.svg"), "ve"); - countryEdit->addItem(QIcon(":/resources/countries/vg.svg"), "vg"); - countryEdit->addItem(QIcon(":/resources/countries/vi.svg"), "vi"); - countryEdit->addItem(QIcon(":/resources/countries/vn.svg"), "vn"); - countryEdit->addItem(QIcon(":/resources/countries/vu.svg"), "vu"); - countryEdit->addItem(QIcon(":/resources/countries/wf.svg"), "wf"); - countryEdit->addItem(QIcon(":/resources/countries/ws.svg"), "ws"); - countryEdit->addItem(QIcon(":/resources/countries/ye.svg"), "ye"); - countryEdit->addItem(QIcon(":/resources/countries/yt.svg"), "yt"); - countryEdit->addItem(QIcon(":/resources/countries/za.svg"), "za"); - countryEdit->addItem(QIcon(":/resources/countries/zm.svg"), "zm"); - countryEdit->addItem(QIcon(":/resources/countries/zw.svg"), "zw"); countryEdit->setCurrentIndex(0); - for(int i = 0; i < countryEdit->count(); ++i) + + QStringList countries = settingsCache->getCountries(); + int i = 1; + foreach(QString c, countries) { - if(countryEdit->itemText(i) == country) - { + countryEdit->addItem(QPixmap(":/resources/countries/" + c + ".svg"), c); + if(c == country) countryEdit->setCurrentIndex(i); - break; - } + + ++i; } realnameLabel = new QLabel(tr("Real name:")); @@ -310,7 +65,7 @@ DlgEditUser::DlgEditUser(QWidget *parent, QString email, int gender, QString cou mainLayout->addWidget(buttonBox); setLayout(mainLayout); - setWindowTitle(tr("Edit user informations")); + setWindowTitle(tr("Edit user profile")); setFixedHeight(sizeHint().height()); setMinimumWidth(300); } diff --git a/cockatrice/src/dlg_register.cpp b/cockatrice/src/dlg_register.cpp index af30da59..3187292a 100644 --- a/cockatrice/src/dlg_register.cpp +++ b/cockatrice/src/dlg_register.cpp @@ -7,6 +7,7 @@ #include #include "dlg_register.h" +#include "settingscache.h" #include "pb/serverinfo_user.pb.h" DlgRegister::DlgRegister(QWidget *parent) @@ -39,265 +40,21 @@ DlgRegister::DlgRegister(QWidget *parent) genderLabel = new QLabel(tr("Gender:")); genderEdit = new QComboBox(); genderLabel->setBuddy(genderEdit); - genderEdit->insertItem(0, QIcon(":/resources/genders/unknown.svg"), tr("Undefined")); - genderEdit->insertItem(1, QIcon(":/resources/genders/male.svg"), tr("Male")); - genderEdit->insertItem(2, QIcon(":/resources/genders/female.svg"), tr("Female")); + genderEdit->insertItem(0, QIcon(":/resources/genders/unknown.svg"), tr("Neutral")); + genderEdit->insertItem(1, QIcon(":/resources/genders/male.svg"), tr("Masculine")); + genderEdit->insertItem(2, QIcon(":/resources/genders/female.svg"), tr("Feminine")); genderEdit->setCurrentIndex(0); countryLabel = new QLabel(tr("Country:")); countryEdit = new QComboBox(); countryLabel->setBuddy(countryEdit); countryEdit->insertItem(0, tr("Undefined")); - countryEdit->addItem(QPixmap(":/resources/countries/ad.svg"), "ad"); - countryEdit->addItem(QIcon(":/resources/countries/ae.svg"), "ae"); - countryEdit->addItem(QIcon(":/resources/countries/af.svg"), "af"); - countryEdit->addItem(QIcon(":/resources/countries/ag.svg"), "ag"); - countryEdit->addItem(QIcon(":/resources/countries/ai.svg"), "ai"); - countryEdit->addItem(QIcon(":/resources/countries/al.svg"), "al"); - countryEdit->addItem(QIcon(":/resources/countries/am.svg"), "am"); - countryEdit->addItem(QIcon(":/resources/countries/ao.svg"), "ao"); - countryEdit->addItem(QIcon(":/resources/countries/aq.svg"), "aq"); - countryEdit->addItem(QIcon(":/resources/countries/ar.svg"), "ar"); - countryEdit->addItem(QIcon(":/resources/countries/as.svg"), "as"); - countryEdit->addItem(QIcon(":/resources/countries/at.svg"), "at"); - countryEdit->addItem(QIcon(":/resources/countries/au.svg"), "au"); - countryEdit->addItem(QIcon(":/resources/countries/aw.svg"), "aw"); - countryEdit->addItem(QIcon(":/resources/countries/ax.svg"), "ax"); - countryEdit->addItem(QIcon(":/resources/countries/az.svg"), "az"); - countryEdit->addItem(QIcon(":/resources/countries/ba.svg"), "ba"); - countryEdit->addItem(QIcon(":/resources/countries/bb.svg"), "bb"); - countryEdit->addItem(QIcon(":/resources/countries/bd.svg"), "bd"); - countryEdit->addItem(QIcon(":/resources/countries/be.svg"), "be"); - countryEdit->addItem(QIcon(":/resources/countries/bf.svg"), "bf"); - countryEdit->addItem(QIcon(":/resources/countries/bg.svg"), "bg"); - countryEdit->addItem(QIcon(":/resources/countries/bh.svg"), "bh"); - countryEdit->addItem(QIcon(":/resources/countries/bi.svg"), "bi"); - countryEdit->addItem(QIcon(":/resources/countries/bj.svg"), "bj"); - countryEdit->addItem(QIcon(":/resources/countries/bl.svg"), "bl"); - countryEdit->addItem(QIcon(":/resources/countries/bm.svg"), "bm"); - countryEdit->addItem(QIcon(":/resources/countries/bn.svg"), "bn"); - countryEdit->addItem(QIcon(":/resources/countries/bo.svg"), "bo"); - countryEdit->addItem(QIcon(":/resources/countries/bq.svg"), "bq"); - countryEdit->addItem(QIcon(":/resources/countries/br.svg"), "br"); - countryEdit->addItem(QIcon(":/resources/countries/bs.svg"), "bs"); - countryEdit->addItem(QIcon(":/resources/countries/bt.svg"), "bt"); - countryEdit->addItem(QIcon(":/resources/countries/bv.svg"), "bv"); - countryEdit->addItem(QIcon(":/resources/countries/bw.svg"), "bw"); - countryEdit->addItem(QIcon(":/resources/countries/by.svg"), "by"); - countryEdit->addItem(QIcon(":/resources/countries/bz.svg"), "bz"); - countryEdit->addItem(QIcon(":/resources/countries/ca.svg"), "ca"); - countryEdit->addItem(QIcon(":/resources/countries/cc.svg"), "cc"); - countryEdit->addItem(QIcon(":/resources/countries/cd.svg"), "cd"); - countryEdit->addItem(QIcon(":/resources/countries/cf.svg"), "cf"); - countryEdit->addItem(QIcon(":/resources/countries/cg.svg"), "cg"); - countryEdit->addItem(QIcon(":/resources/countries/ch.svg"), "ch"); - countryEdit->addItem(QIcon(":/resources/countries/ci.svg"), "ci"); - countryEdit->addItem(QIcon(":/resources/countries/ck.svg"), "ck"); - countryEdit->addItem(QIcon(":/resources/countries/cl.svg"), "cl"); - countryEdit->addItem(QIcon(":/resources/countries/cm.svg"), "cm"); - countryEdit->addItem(QIcon(":/resources/countries/cn.svg"), "cn"); - countryEdit->addItem(QIcon(":/resources/countries/co.svg"), "co"); - countryEdit->addItem(QIcon(":/resources/countries/cr.svg"), "cr"); - countryEdit->addItem(QIcon(":/resources/countries/cu.svg"), "cu"); - countryEdit->addItem(QIcon(":/resources/countries/cv.svg"), "cv"); - countryEdit->addItem(QIcon(":/resources/countries/cw.svg"), "cw"); - countryEdit->addItem(QIcon(":/resources/countries/cx.svg"), "cx"); - countryEdit->addItem(QIcon(":/resources/countries/cy.svg"), "cy"); - countryEdit->addItem(QIcon(":/resources/countries/cz.svg"), "cz"); - countryEdit->addItem(QIcon(":/resources/countries/de.svg"), "de"); - countryEdit->addItem(QIcon(":/resources/countries/dj.svg"), "dj"); - countryEdit->addItem(QIcon(":/resources/countries/dk.svg"), "dk"); - countryEdit->addItem(QIcon(":/resources/countries/dm.svg"), "dm"); - countryEdit->addItem(QIcon(":/resources/countries/do.svg"), "do"); - countryEdit->addItem(QIcon(":/resources/countries/dz.svg"), "dz"); - countryEdit->addItem(QIcon(":/resources/countries/ec.svg"), "ec"); - countryEdit->addItem(QIcon(":/resources/countries/ee.svg"), "ee"); - countryEdit->addItem(QIcon(":/resources/countries/eg.svg"), "eg"); - countryEdit->addItem(QIcon(":/resources/countries/eh.svg"), "eh"); - countryEdit->addItem(QIcon(":/resources/countries/er.svg"), "er"); - countryEdit->addItem(QIcon(":/resources/countries/es.svg"), "es"); - countryEdit->addItem(QIcon(":/resources/countries/et.svg"), "et"); - countryEdit->addItem(QIcon(":/resources/countries/fi.svg"), "fi"); - countryEdit->addItem(QIcon(":/resources/countries/fj.svg"), "fj"); - countryEdit->addItem(QIcon(":/resources/countries/fk.svg"), "fk"); - countryEdit->addItem(QIcon(":/resources/countries/fm.svg"), "fm"); - countryEdit->addItem(QIcon(":/resources/countries/fo.svg"), "fo"); - countryEdit->addItem(QIcon(":/resources/countries/fr.svg"), "fr"); - countryEdit->addItem(QIcon(":/resources/countries/ga.svg"), "ga"); - countryEdit->addItem(QIcon(":/resources/countries/gb.svg"), "gb"); - countryEdit->addItem(QIcon(":/resources/countries/gd.svg"), "gd"); - countryEdit->addItem(QIcon(":/resources/countries/ge.svg"), "ge"); - countryEdit->addItem(QIcon(":/resources/countries/gf.svg"), "gf"); - countryEdit->addItem(QIcon(":/resources/countries/gg.svg"), "gg"); - countryEdit->addItem(QIcon(":/resources/countries/gh.svg"), "gh"); - countryEdit->addItem(QIcon(":/resources/countries/gi.svg"), "gi"); - countryEdit->addItem(QIcon(":/resources/countries/gl.svg"), "gl"); - countryEdit->addItem(QIcon(":/resources/countries/gm.svg"), "gm"); - countryEdit->addItem(QIcon(":/resources/countries/gn.svg"), "gn"); - countryEdit->addItem(QIcon(":/resources/countries/gp.svg"), "gp"); - countryEdit->addItem(QIcon(":/resources/countries/gq.svg"), "gq"); - countryEdit->addItem(QIcon(":/resources/countries/gr.svg"), "gr"); - countryEdit->addItem(QIcon(":/resources/countries/gs.svg"), "gs"); - countryEdit->addItem(QIcon(":/resources/countries/gt.svg"), "gt"); - countryEdit->addItem(QIcon(":/resources/countries/gu.svg"), "gu"); - countryEdit->addItem(QIcon(":/resources/countries/gw.svg"), "gw"); - countryEdit->addItem(QIcon(":/resources/countries/gy.svg"), "gy"); - countryEdit->addItem(QIcon(":/resources/countries/hk.svg"), "hk"); - countryEdit->addItem(QIcon(":/resources/countries/hm.svg"), "hm"); - countryEdit->addItem(QIcon(":/resources/countries/hn.svg"), "hn"); - countryEdit->addItem(QIcon(":/resources/countries/hr.svg"), "hr"); - countryEdit->addItem(QIcon(":/resources/countries/ht.svg"), "ht"); - countryEdit->addItem(QIcon(":/resources/countries/hu.svg"), "hu"); - countryEdit->addItem(QIcon(":/resources/countries/id.svg"), "id"); - countryEdit->addItem(QIcon(":/resources/countries/ie.svg"), "ie"); - countryEdit->addItem(QIcon(":/resources/countries/il.svg"), "il"); - countryEdit->addItem(QIcon(":/resources/countries/im.svg"), "im"); - countryEdit->addItem(QIcon(":/resources/countries/in.svg"), "in"); - countryEdit->addItem(QIcon(":/resources/countries/io.svg"), "io"); - countryEdit->addItem(QIcon(":/resources/countries/iq.svg"), "iq"); - countryEdit->addItem(QIcon(":/resources/countries/ir.svg"), "ir"); - countryEdit->addItem(QIcon(":/resources/countries/is.svg"), "is"); - countryEdit->addItem(QIcon(":/resources/countries/it.svg"), "it"); - countryEdit->addItem(QIcon(":/resources/countries/je.svg"), "je"); - countryEdit->addItem(QIcon(":/resources/countries/jm.svg"), "jm"); - countryEdit->addItem(QIcon(":/resources/countries/jo.svg"), "jo"); - countryEdit->addItem(QIcon(":/resources/countries/jp.svg"), "jp"); - countryEdit->addItem(QIcon(":/resources/countries/ke.svg"), "ke"); - countryEdit->addItem(QIcon(":/resources/countries/kg.svg"), "kg"); - countryEdit->addItem(QIcon(":/resources/countries/kh.svg"), "kh"); - countryEdit->addItem(QIcon(":/resources/countries/ki.svg"), "ki"); - countryEdit->addItem(QIcon(":/resources/countries/km.svg"), "km"); - countryEdit->addItem(QIcon(":/resources/countries/kn.svg"), "kn"); - countryEdit->addItem(QIcon(":/resources/countries/kp.svg"), "kp"); - countryEdit->addItem(QIcon(":/resources/countries/kr.svg"), "kr"); - countryEdit->addItem(QIcon(":/resources/countries/kw.svg"), "kw"); - countryEdit->addItem(QIcon(":/resources/countries/ky.svg"), "ky"); - countryEdit->addItem(QIcon(":/resources/countries/kz.svg"), "kz"); - countryEdit->addItem(QIcon(":/resources/countries/la.svg"), "la"); - countryEdit->addItem(QIcon(":/resources/countries/lb.svg"), "lb"); - countryEdit->addItem(QIcon(":/resources/countries/lc.svg"), "lc"); - countryEdit->addItem(QIcon(":/resources/countries/li.svg"), "li"); - countryEdit->addItem(QIcon(":/resources/countries/lk.svg"), "lk"); - countryEdit->addItem(QIcon(":/resources/countries/lr.svg"), "lr"); - countryEdit->addItem(QIcon(":/resources/countries/ls.svg"), "ls"); - countryEdit->addItem(QIcon(":/resources/countries/lt.svg"), "lt"); - countryEdit->addItem(QIcon(":/resources/countries/lu.svg"), "lu"); - countryEdit->addItem(QIcon(":/resources/countries/lv.svg"), "lv"); - countryEdit->addItem(QIcon(":/resources/countries/ly.svg"), "ly"); - countryEdit->addItem(QIcon(":/resources/countries/ma.svg"), "ma"); - countryEdit->addItem(QIcon(":/resources/countries/mc.svg"), "mc"); - countryEdit->addItem(QIcon(":/resources/countries/md.svg"), "md"); - countryEdit->addItem(QIcon(":/resources/countries/me.svg"), "me"); - countryEdit->addItem(QIcon(":/resources/countries/mf.svg"), "mf"); - countryEdit->addItem(QIcon(":/resources/countries/mg.svg"), "mg"); - countryEdit->addItem(QIcon(":/resources/countries/mh.svg"), "mh"); - countryEdit->addItem(QIcon(":/resources/countries/mk.svg"), "mk"); - countryEdit->addItem(QIcon(":/resources/countries/ml.svg"), "ml"); - countryEdit->addItem(QIcon(":/resources/countries/mm.svg"), "mm"); - countryEdit->addItem(QIcon(":/resources/countries/mn.svg"), "mn"); - countryEdit->addItem(QIcon(":/resources/countries/mo.svg"), "mo"); - countryEdit->addItem(QIcon(":/resources/countries/mp.svg"), "mp"); - countryEdit->addItem(QIcon(":/resources/countries/mq.svg"), "mq"); - countryEdit->addItem(QIcon(":/resources/countries/mr.svg"), "mr"); - countryEdit->addItem(QIcon(":/resources/countries/ms.svg"), "ms"); - countryEdit->addItem(QIcon(":/resources/countries/mt.svg"), "mt"); - countryEdit->addItem(QIcon(":/resources/countries/mu.svg"), "mu"); - countryEdit->addItem(QIcon(":/resources/countries/mv.svg"), "mv"); - countryEdit->addItem(QIcon(":/resources/countries/mw.svg"), "mw"); - countryEdit->addItem(QIcon(":/resources/countries/mx.svg"), "mx"); - countryEdit->addItem(QIcon(":/resources/countries/my.svg"), "my"); - countryEdit->addItem(QIcon(":/resources/countries/mz.svg"), "mz"); - countryEdit->addItem(QIcon(":/resources/countries/na.svg"), "na"); - countryEdit->addItem(QIcon(":/resources/countries/nc.svg"), "nc"); - countryEdit->addItem(QIcon(":/resources/countries/ne.svg"), "ne"); - countryEdit->addItem(QIcon(":/resources/countries/nf.svg"), "nf"); - countryEdit->addItem(QIcon(":/resources/countries/ng.svg"), "ng"); - countryEdit->addItem(QIcon(":/resources/countries/ni.svg"), "ni"); - countryEdit->addItem(QIcon(":/resources/countries/nl.svg"), "nl"); - countryEdit->addItem(QIcon(":/resources/countries/no.svg"), "no"); - countryEdit->addItem(QIcon(":/resources/countries/np.svg"), "np"); - countryEdit->addItem(QIcon(":/resources/countries/nr.svg"), "nr"); - countryEdit->addItem(QIcon(":/resources/countries/nu.svg"), "nu"); - countryEdit->addItem(QIcon(":/resources/countries/nz.svg"), "nz"); - countryEdit->addItem(QIcon(":/resources/countries/om.svg"), "om"); - countryEdit->addItem(QIcon(":/resources/countries/pa.svg"), "pa"); - countryEdit->addItem(QIcon(":/resources/countries/pe.svg"), "pe"); - countryEdit->addItem(QIcon(":/resources/countries/pf.svg"), "pf"); - countryEdit->addItem(QIcon(":/resources/countries/pg.svg"), "pg"); - countryEdit->addItem(QIcon(":/resources/countries/ph.svg"), "ph"); - countryEdit->addItem(QIcon(":/resources/countries/pk.svg"), "pk"); - countryEdit->addItem(QIcon(":/resources/countries/pl.svg"), "pl"); - countryEdit->addItem(QIcon(":/resources/countries/pm.svg"), "pm"); - countryEdit->addItem(QIcon(":/resources/countries/pn.svg"), "pn"); - countryEdit->addItem(QIcon(":/resources/countries/pr.svg"), "pr"); - countryEdit->addItem(QIcon(":/resources/countries/ps.svg"), "ps"); - countryEdit->addItem(QIcon(":/resources/countries/pt.svg"), "pt"); - countryEdit->addItem(QIcon(":/resources/countries/pw.svg"), "pw"); - countryEdit->addItem(QIcon(":/resources/countries/py.svg"), "py"); - countryEdit->addItem(QIcon(":/resources/countries/qa.svg"), "qa"); - countryEdit->addItem(QIcon(":/resources/countries/re.svg"), "re"); - countryEdit->addItem(QIcon(":/resources/countries/ro.svg"), "ro"); - countryEdit->addItem(QIcon(":/resources/countries/rs.svg"), "rs"); - countryEdit->addItem(QIcon(":/resources/countries/ru.svg"), "ru"); - countryEdit->addItem(QIcon(":/resources/countries/rw.svg"), "rw"); - countryEdit->addItem(QIcon(":/resources/countries/sa.svg"), "sa"); - countryEdit->addItem(QIcon(":/resources/countries/sb.svg"), "sb"); - countryEdit->addItem(QIcon(":/resources/countries/sc.svg"), "sc"); - countryEdit->addItem(QIcon(":/resources/countries/sd.svg"), "sd"); - countryEdit->addItem(QIcon(":/resources/countries/se.svg"), "se"); - countryEdit->addItem(QIcon(":/resources/countries/sg.svg"), "sg"); - countryEdit->addItem(QIcon(":/resources/countries/sh.svg"), "sh"); - countryEdit->addItem(QIcon(":/resources/countries/si.svg"), "si"); - countryEdit->addItem(QIcon(":/resources/countries/sj.svg"), "sj"); - countryEdit->addItem(QIcon(":/resources/countries/sk.svg"), "sk"); - countryEdit->addItem(QIcon(":/resources/countries/sl.svg"), "sl"); - countryEdit->addItem(QIcon(":/resources/countries/sm.svg"), "sm"); - countryEdit->addItem(QIcon(":/resources/countries/sn.svg"), "sn"); - countryEdit->addItem(QIcon(":/resources/countries/so.svg"), "so"); - countryEdit->addItem(QIcon(":/resources/countries/sr.svg"), "sr"); - countryEdit->addItem(QIcon(":/resources/countries/ss.svg"), "ss"); - countryEdit->addItem(QIcon(":/resources/countries/st.svg"), "st"); - countryEdit->addItem(QIcon(":/resources/countries/sv.svg"), "sv"); - countryEdit->addItem(QIcon(":/resources/countries/sx.svg"), "sx"); - countryEdit->addItem(QIcon(":/resources/countries/sy.svg"), "sy"); - countryEdit->addItem(QIcon(":/resources/countries/sz.svg"), "sz"); - countryEdit->addItem(QIcon(":/resources/countries/tc.svg"), "tc"); - countryEdit->addItem(QIcon(":/resources/countries/td.svg"), "td"); - countryEdit->addItem(QIcon(":/resources/countries/tf.svg"), "tf"); - countryEdit->addItem(QIcon(":/resources/countries/tg.svg"), "tg"); - countryEdit->addItem(QIcon(":/resources/countries/th.svg"), "th"); - countryEdit->addItem(QIcon(":/resources/countries/tj.svg"), "tj"); - countryEdit->addItem(QIcon(":/resources/countries/tk.svg"), "tk"); - countryEdit->addItem(QIcon(":/resources/countries/tl.svg"), "tl"); - countryEdit->addItem(QIcon(":/resources/countries/tm.svg"), "tm"); - countryEdit->addItem(QIcon(":/resources/countries/tn.svg"), "tn"); - countryEdit->addItem(QIcon(":/resources/countries/to.svg"), "to"); - countryEdit->addItem(QIcon(":/resources/countries/tr.svg"), "tr"); - countryEdit->addItem(QIcon(":/resources/countries/tt.svg"), "tt"); - countryEdit->addItem(QIcon(":/resources/countries/tv.svg"), "tv"); - countryEdit->addItem(QIcon(":/resources/countries/tw.svg"), "tw"); - countryEdit->addItem(QIcon(":/resources/countries/tz.svg"), "tz"); - countryEdit->addItem(QIcon(":/resources/countries/ua.svg"), "ua"); - countryEdit->addItem(QIcon(":/resources/countries/ug.svg"), "ug"); - countryEdit->addItem(QIcon(":/resources/countries/um.svg"), "um"); - countryEdit->addItem(QIcon(":/resources/countries/us.svg"), "us"); - countryEdit->addItem(QIcon(":/resources/countries/uy.svg"), "uy"); - countryEdit->addItem(QIcon(":/resources/countries/uz.svg"), "uz"); - countryEdit->addItem(QIcon(":/resources/countries/va.svg"), "va"); - countryEdit->addItem(QIcon(":/resources/countries/vc.svg"), "vc"); - countryEdit->addItem(QIcon(":/resources/countries/ve.svg"), "ve"); - countryEdit->addItem(QIcon(":/resources/countries/vg.svg"), "vg"); - countryEdit->addItem(QIcon(":/resources/countries/vi.svg"), "vi"); - countryEdit->addItem(QIcon(":/resources/countries/vn.svg"), "vn"); - countryEdit->addItem(QIcon(":/resources/countries/vu.svg"), "vu"); - countryEdit->addItem(QIcon(":/resources/countries/wf.svg"), "wf"); - countryEdit->addItem(QIcon(":/resources/countries/ws.svg"), "ws"); - countryEdit->addItem(QIcon(":/resources/countries/ye.svg"), "ye"); - countryEdit->addItem(QIcon(":/resources/countries/yt.svg"), "yt"); - countryEdit->addItem(QIcon(":/resources/countries/za.svg"), "za"); - countryEdit->addItem(QIcon(":/resources/countries/zm.svg"), "zm"); - countryEdit->addItem(QIcon(":/resources/countries/zw.svg"), "zw"); countryEdit->setCurrentIndex(0); + QStringList countries = settingsCache->getCountries(); + foreach(QString c, countries) + { + countryEdit->addItem(QPixmap(":/resources/countries/" + c + ".svg"), c); + } realnameLabel = new QLabel(tr("Real name:")); realnameEdit = new QLineEdit(); diff --git a/cockatrice/src/settingscache.cpp b/cockatrice/src/settingscache.cpp index 16ef669b..454e9c51 100644 --- a/cockatrice/src/settingscache.cpp +++ b/cockatrice/src/settingscache.cpp @@ -386,3 +386,35 @@ void SettingsCache::setPixmapCacheSize(const int _pixmapCacheSize) settings->setValue("personal/pixmapCacheSize", pixmapCacheSize); emit pixmapCacheSizeChanged(pixmapCacheSize); } + +QStringList SettingsCache::getCountries() const +{ + static QStringList countries = QStringList() + << "ad" << "ae" << "af" << "ag" << "ai" << "al" << "am" << "ao" << "aq" << "ar" + << "as" << "at" << "au" << "aw" << "ax" << "az" << "ba" << "bb" << "bd" << "be" + << "bf" << "bg" << "bh" << "bi" << "bj" << "bl" << "bm" << "bn" << "bo" << "bq" + << "br" << "bs" << "bt" << "bv" << "bw" << "by" << "bz" << "ca" << "cc" << "cd" + << "cf" << "cg" << "ch" << "ci" << "ck" << "cl" << "cm" << "cn" << "co" << "cr" + << "cu" << "cv" << "cw" << "cx" << "cy" << "cz" << "de" << "dj" << "dk" << "dm" + << "do" << "dz" << "ec" << "ee" << "eg" << "eh" << "er" << "es" << "et" << "fi" + << "fj" << "fk" << "fm" << "fo" << "fr" << "ga" << "gb" << "gd" << "ge" << "gf" + << "gg" << "gh" << "gi" << "gl" << "gm" << "gn" << "gp" << "gq" << "gr" << "gs" + << "gt" << "gu" << "gw" << "gy" << "hk" << "hm" << "hn" << "hr" << "ht" << "hu" + << "id" << "ie" << "il" << "im" << "in" << "io" << "iq" << "ir" << "is" << "it" + << "je" << "jm" << "jo" << "jp" << "ke" << "kg" << "kh" << "ki" << "km" << "kn" + << "kp" << "kr" << "kw" << "ky" << "kz" << "la" << "lb" << "lc" << "li" << "lk" + << "lr" << "ls" << "lt" << "lu" << "lv" << "ly" << "ma" << "mc" << "md" << "me" + << "mf" << "mg" << "mh" << "mk" << "ml" << "mm" << "mn" << "mo" << "mp" << "mq" + << "mr" << "ms" << "mt" << "mu" << "mv" << "mw" << "mx" << "my" << "mz" << "na" + << "nc" << "ne" << "nf" << "ng" << "ni" << "nl" << "no" << "np" << "nr" << "nu" + << "nz" << "om" << "pa" << "pe" << "pf" << "pg" << "ph" << "pk" << "pl" << "pm" + << "pn" << "pr" << "ps" << "pt" << "pw" << "py" << "qa" << "re" << "ro" << "rs" + << "ru" << "rw" << "sa" << "sb" << "sc" << "sd" << "se" << "sg" << "sh" << "si" + << "sj" << "sk" << "sl" << "sm" << "sn" << "so" << "sr" << "ss" << "st" << "sv" + << "sx" << "sy" << "sz" << "tc" << "td" << "tf" << "tg" << "th" << "tj" << "tk" + << "tl" << "tm" << "tn" << "to" << "tr" << "tt" << "tv" << "tw" << "tz" << "ua" + << "ug" << "um" << "us" << "uy" << "uz" << "va" << "vc" << "ve" << "vg" << "vi" + << "vn" << "vu" << "wf" << "ws" << "ye" << "yt" << "za" << "zm" << "zw"; + + return countries; +} \ No newline at end of file diff --git a/cockatrice/src/settingscache.h b/cockatrice/src/settingscache.h index e3850a81..fa6155a8 100644 --- a/cockatrice/src/settingscache.h +++ b/cockatrice/src/settingscache.h @@ -2,6 +2,7 @@ #define SETTINGSCACHE_H #include +#include // the falbacks are used for cards without a muid #define PIC_URL_DEFAULT "http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!cardid!&type=card" @@ -139,6 +140,7 @@ public: bool getLeftJustified() const { return leftJustified; } int getMasterVolume() const { return masterVolume; } int getCardInfoViewMode() const { return cardInfoViewMode; } + QStringList getCountries() const; public slots: void setMainWindowGeometry(const QByteArray &_mainWindowGeometry); void setLang(const QString &_lang); diff --git a/common/server_database_interface.h b/common/server_database_interface.h index 03232dbd..3be6f263 100644 --- a/common/server_database_interface.h +++ b/common/server_database_interface.h @@ -45,7 +45,7 @@ public: virtual void logMessage(const int /* senderId */, const QString & /* senderName */, const QString & /* senderIp */, const QString & /* logMessage */, LogMessage_TargetType /* targetType */, const int /* targetId */, const QString & /* targetName */) { }; bool checkUserIsBanned(Server_ProtocolHandler *session, QString &banReason, int &banSecondsRemaining); virtual bool changeUserPassword(const QString & /* user */, const QString & /* oldPassword */, const QString & /* newPassword */) { return true; }; - virtual QChar getGenderChar(ServerInfo_User_Gender const &gender) { return QChar('u'); }; + virtual QChar getGenderChar(ServerInfo_User_Gender const & /* gender */) { return QChar('u'); }; }; #endif