From 69e8db441ce24a08b1f0274b13761c2beeb8f99e Mon Sep 17 00:00:00 2001
From: poixen <githubpoixen@gmail.com>
Date: Fri, 15 Jul 2016 15:19:02 +0200
Subject: [PATCH] updated login

---
 cockatrice/src/dlg_connect.cpp | 43 ++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/cockatrice/src/dlg_connect.cpp b/cockatrice/src/dlg_connect.cpp
index ccdc02f8..77dbf463 100644
--- a/cockatrice/src/dlg_connect.cpp
+++ b/cockatrice/src/dlg_connect.cpp
@@ -10,6 +10,7 @@
 #include <QKeyEvent>
 #include <QMessageBox>
 #include <iostream>
+#include <QGroupBox>
 #include "dlg_connect.h"
 #include "settingscache.h"
 
@@ -65,20 +66,32 @@ DlgConnect::DlgConnect(QWidget *parent)
 
     connect(savePasswordCheckBox, SIGNAL(stateChanged(int)), this, SLOT(passwordSaved(int)));
 
+    QGridLayout *connectionLayout = new QGridLayout;
+    connectionLayout->addWidget(previousHostButton, 0, 1);
+    connectionLayout->addWidget(previousHosts, 1, 1);
+    connectionLayout->addWidget(newHostButton, 2, 1);
+    connectionLayout->addWidget(hostLabel, 3, 0);
+    connectionLayout->addWidget(hostEdit, 3, 1);
+    connectionLayout->addWidget(portLabel, 4, 0);
+    connectionLayout->addWidget(portEdit, 4, 1);
+
+    QGroupBox *restrictionsGroupBox = new QGroupBox(tr("Server"));
+    restrictionsGroupBox->setLayout(connectionLayout);
+
+    QGridLayout *loginLayout = new QGridLayout;
+    loginLayout->addWidget(playernameLabel, 0, 0);
+    loginLayout->addWidget(playernameEdit, 0, 1);
+    loginLayout->addWidget(passwordLabel, 1, 0);
+    loginLayout->addWidget(passwordEdit, 1, 1);
+
+    QGroupBox *loginGroupBox = new QGroupBox(tr("Login"));
+    loginGroupBox->setLayout(loginLayout);
+
     QGridLayout *grid = new QGridLayout;
-    grid->addWidget(previousHostButton, 0, 1);
-    grid->addWidget(previousHosts, 1, 1);
-    grid->addWidget(newHostButton, 2, 1);
-    grid->addWidget(hostLabel, 3, 0);
-    grid->addWidget(hostEdit, 3, 1);
-    grid->addWidget(portLabel, 4, 0);
-    grid->addWidget(portEdit, 4, 1);
-    grid->addWidget(playernameLabel, 5, 0);
-    grid->addWidget(playernameEdit, 5, 1);
-    grid->addWidget(passwordLabel, 6, 0);
-    grid->addWidget(passwordEdit, 6, 1);
-    grid->addWidget(savePasswordCheckBox, 7, 0, 1, 2);
-    grid->addWidget(autoConnectCheckBox, 8, 0, 1, 2);
+    grid->addWidget(restrictionsGroupBox, 0, 0);
+    grid->addWidget(loginGroupBox, 1, 0);
+    grid->addWidget(savePasswordCheckBox, 3, 0);
+    grid->addWidget(autoConnectCheckBox, 4, 0);
     
     QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(actOk()));
@@ -100,11 +113,14 @@ DlgConnect::DlgConnect(QWidget *parent)
         previousHostButton->setChecked(true);
     else
         newHostButton->setChecked(true);
+
+    playernameEdit->setFocus();
 }
 
 
 void DlgConnect::previousHostSelected(bool state) {
     if (state) {
+        hostLabel->setDisabled(true);
         hostEdit->setDisabled(true);
         previousHosts->setDisabled(false);
     }
@@ -113,6 +129,7 @@ void DlgConnect::previousHostSelected(bool state) {
 void DlgConnect::newHostSelected(bool state) {
     if (state) {
         hostEdit->setDisabled(false);
+        hostLabel->setDisabled(false);
         previousHosts->setDisabled(true);
     }
 }