| changeset 5390 | f41e87de8989 |
| parent 5230 | c088be28d5e8 |
| child 5861 | b102aa6a853e |
| 5388:73ef8e437231 | 5390:f41e87de8989 |
|---|---|
68 NetSocket.flush(); |
68 NetSocket.flush(); |
69 } |
69 } |
70 |
70 |
71 void HWNewNet::Connect(const QString & hostName, quint16 port, const QString & nick) |
71 void HWNewNet::Connect(const QString & hostName, quint16 port, const QString & nick) |
72 { |
72 { |
73 mynick = nick.isEmpty() ? QLineEdit::tr("unnamed") : nick; |
73 mynick = nick; |
74 while (mynick.isEmpty()) { |
|
75 mynick = QInputDialog::getText(m_pGameCFGWidget, |
|
76 QObject::tr("Nickname"), |
|
77 QObject::tr("Please enter your nickname"), |
|
78 QLineEdit::Normal, |
|
79 QDir::home().dirName()); |
|
80 config->setValue("net/nick",mynick); |
|
81 config->updNetNick(); |
|
82 } |
|
74 myhost = hostName + QString(":%1").arg(port); |
83 myhost = hostName + QString(":%1").arg(port); |
75 NetSocket.connectToHost(hostName, port); |
84 NetSocket.connectToHost(hostName, port); |
76 } |
85 } |
77 |
86 |
78 void HWNewNet::Disconnect() |
87 void HWNewNet::Disconnect() |
505 QString hash = config->value("net/passwordhash", "").toString(); |
514 QString hash = config->value("net/passwordhash", "").toString(); |
506 |
515 |
507 // If the password is blank, ask the user to enter one in |
516 // If the password is blank, ask the user to enter one in |
508 if (passLength == 0) |
517 if (passLength == 0) |
509 { |
518 { |
510 QString password = QInputDialog::getText(0, tr("Password"), tr("Your nickname %1 is\nregistered on Hedgewars.org\nPlease provide your password below\nor pick another nickname in game config:").arg(mynick), QLineEdit::Password, passLength==0?NULL:QString(passLength,'\0'), &ok); |
519 QString password = QInputDialog::getText(m_pGameCFGWidget, tr("Password"), tr("Your nickname %1 is\nregistered on Hedgewars.org\nPlease provide your password below\nor pick another nickname in game config:").arg(mynick), QLineEdit::Password, passLength==0?NULL:QString(passLength,'\0'), &ok); |
511 |
520 |
512 if (!ok) { |
521 if (!ok) { |
513 Disconnect(); |
522 Disconnect(); |
514 emit Disconnected(); |
523 emit Disconnected(); |
515 return; |
524 return; |
829 emit Disconnected(); |
838 emit Disconnected(); |
830 return; |
839 return; |
831 } |
840 } |
832 |
841 |
833 config->setValue("net/nick", newNick); |
842 config->setValue("net/nick", newNick); |
843 config->updNetNick(); |
|
834 mynick = newNick; |
844 mynick = newNick; |
835 |
845 |
836 RawSendNet(QString("NICK%1%2").arg(delimeter).arg(newNick)); |
846 RawSendNet(QString("NICK%1%2").arg(delimeter).arg(newNick)); |
837 |
847 |
838 break; |
848 break; |