--- a/QTfrontend/hwform.cpp Tue Oct 23 06:50:19 2012 +0200
+++ b/QTfrontend/hwform.cpp Tue Oct 23 07:03:07 2012 +0200
@@ -1006,7 +1006,7 @@
void HWForm::NetNickTaken(const QString & nick)
{
bool ok = false;
- QString newNick = QInputDialog::getText(this, tr("Nickname"), tr("Some one already uses\n your nickname %1\non the server.\nPlease pick another nickname:").arg(nick), QLineEdit::Normal, nick, &ok);
+ QString newNick = QInputDialog::getText(this, tr("Nickname"), tr("Someone already uses your nickname %1 on the server.\nPlease pick another nickname:").arg(nick), QLineEdit::Normal, nick, &ok);
if (!ok || newNick.isEmpty())
{
@@ -1236,7 +1236,7 @@
pnetserver = new HWNetServer;
if (!pnetserver->StartServer(ui.pageNetServer->sbPort->value()))
{
- ShowErrorMessage(QMessageBox::tr("Unable to start the server"));
+ ShowErrorMessage(QMessageBox::tr("Unable to start server"));
delete pnetserver;
pnetserver = 0;
--- a/QTfrontend/ui/dialog/ask_quit.cpp Tue Oct 23 06:50:19 2012 +0200
+++ b/QTfrontend/ui/dialog/ask_quit.cpp Tue Oct 23 07:03:07 2012 +0200
@@ -58,6 +58,8 @@
QTimer * timer = new QTimer(this);
connect(timer, SIGNAL(timeout()), this, SLOT(updateList()));
timer->start(200);
+
+ this->setWindowModality(Qt::WindowModal);
}
void HWAskQuitDialog::goToPageVideos()
--- a/QTfrontend/ui/dialog/input_ip.cpp Tue Oct 23 06:50:19 2012 +0200
+++ b/QTfrontend/ui/dialog/input_ip.cpp Tue Oct 23 07:03:07 2012 +0200
@@ -60,6 +60,8 @@
connect(pbOK, SIGNAL(clicked()), this, SLOT(accept()));
connect(pbCancel, SIGNAL(clicked()), this, SLOT(reject()));
connect(pbDefault, SIGNAL(clicked()), this, SLOT(setDefaultPort()));
+
+ this->setWindowModality(Qt::WindowModal);
}
void HWHostPortDialog::setDefaultPort()
--- a/QTfrontend/ui/dialog/input_password.cpp Tue Oct 23 06:50:19 2012 +0200
+++ b/QTfrontend/ui/dialog/input_password.cpp Tue Oct 23 07:03:07 2012 +0200
@@ -50,4 +50,6 @@
connect(pbOK, SIGNAL(clicked()), this, SLOT(accept()));
connect(pbCancel, SIGNAL(clicked()), this, SLOT(reject()));
+
+ this->setWindowModality(Qt::WindowModal);
}
--- a/QTfrontend/ui/dialog/upload_video.cpp Tue Oct 23 06:50:19 2012 +0200
+++ b/QTfrontend/ui/dialog/upload_video.cpp Tue Oct 23 07:03:07 2012 +0200
@@ -158,6 +158,8 @@
connect(btnUpload, SIGNAL(clicked()), this, SLOT(upload()));
connect(pbCancel, SIGNAL(clicked()), this, SLOT(reject()));
+
+ this->setWindowModality(Qt::WindowModal);
}
void HWUploadVideoDialog::showEvent(QShowEvent * event)