QTfrontend/ui/page/pagenetgame.cpp
branchphysfslayer
changeset 7928 88fde28bbda6
parent 7853 e70c633ed833
child 8179 a1ffcb559f99
--- a/QTfrontend/ui/page/pagenetgame.cpp	Sun Oct 21 01:28:33 2012 +0400
+++ b/QTfrontend/ui/page/pagenetgame.cpp	Sat Nov 03 00:34:35 2012 +0400
@@ -62,9 +62,6 @@
 {
     QHBoxLayout * bottomLayout = new QHBoxLayout;
 
-    btnDLC = addButton(tr("DLC"), bottomLayout, 0);
-    btnDLC->setWhatsThis(tr("Downloadable Content"));
-
     leRoomName = new HistoryLineEdit(this,10);
     leRoomName->setMaxLength(60);
     leRoomName->setMinimumWidth(200);
@@ -79,23 +76,21 @@
     BtnGo->setMinimumHeight(50);
 
     bottomLayout->addWidget(leRoomName);
-    BtnUpdate = addButton(QAction::tr("Update"), bottomLayout, 2);
+    BtnUpdate = addButton(QAction::tr("Update"), bottomLayout, 1);
 
     bottomLayout->addStretch();
     bottomLayout->addWidget(BtnGo);
 
-    BtnMaster = addButton(tr("Control"), bottomLayout, 4);
+    BtnMaster = addButton(tr("Control"), bottomLayout, 3);
     bottomLayout->insertStretch(3, 100);
 
-    BtnStart = addButton(QAction::tr("Start"), bottomLayout, 4);
+    BtnStart = addButton(QAction::tr("Start"), bottomLayout, 3);
 
     return bottomLayout;
 }
 
 void PageNetGame::connectSignals()
 {
-    connect(btnDLC, SIGNAL(clicked()), this, SIGNAL(DLCClicked()));
-
     connect(btnSetup, SIGNAL(clicked()), this, SIGNAL(SetupClicked()));
 
     connect(BtnUpdate, SIGNAL(clicked()), this, SLOT(onUpdateClick()));
@@ -157,10 +152,12 @@
     else
     {
         leRoomName->clear();
-        QMessageBox::critical(this,
-                              tr("Error"),
-                              tr("Please enter room name"),
-                              tr("OK"));
+        QMessageBox roomMsg(this);
+        roomMsg.setIcon(QMessageBox::Warning);
+        roomMsg.setWindowTitle(QMessageBox::tr("Netgame - Error"));
+        roomMsg.setText(QMessageBox::tr("Please enter room name"));
+        roomMsg.setWindowModality(Qt::WindowModal);
+        roomMsg.exec();
     }
 }
 
@@ -177,10 +174,6 @@
     BtnStart->setVisible(isMaster);
     BtnUpdate->setVisible(isMaster);
     leRoomName->setVisible(isMaster);
-
-    //disable the `toggle ready` button, because the start button does the same
-    //job when the user is chief
-    BtnGo->setVisible(!isMaster);
 }
 
 void PageNetGame::setUser(const QString & nickname)