# HG changeset patch
# User koda
# Date 1350968587 -7200
# Node ID ba32d3f9e5670dc42cd18ef7891adeed0a8c45fd
# Parent  ab7b94c03bc959765c164fc946019f9ca09e769f
set window modality also for custom dialogs, small text changes

diff -r ab7b94c03bc9 -r ba32d3f9e567 QTfrontend/hwform.cpp
--- 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;
diff -r ab7b94c03bc9 -r ba32d3f9e567 QTfrontend/ui/dialog/ask_quit.cpp
--- 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()
diff -r ab7b94c03bc9 -r ba32d3f9e567 QTfrontend/ui/dialog/input_ip.cpp
--- 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()
diff -r ab7b94c03bc9 -r ba32d3f9e567 QTfrontend/ui/dialog/input_password.cpp
--- 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);
 }
diff -r ab7b94c03bc9 -r ba32d3f9e567 QTfrontend/ui/dialog/upload_video.cpp
--- 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)