aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

connect dialog tweaks (#3211)

Browse source
This commit is contained in:
tooomm 2018-04-23 20:30:46 +02:00 committed by Zach H
parent f5eb05b682
commit 8a5baa4637
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
cockatrice/src/dlg_connect.cpp
View file

@ -26,7 +26,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
btnRefreshServers = new QPushButton(this); btnRefreshServers = new QPushButton(this);
btnRefreshServers->setIcon(QPixmap("theme:icons/update")); btnRefreshServers->setIcon(QPixmap("theme:icons/update"));
btnRefreshServers->setToolTip(tr("Refresh the server list with known public servers")); btnRefreshServers->setToolTip(tr("Refresh the server list with known public servers"));
btnRefreshServers->setFixedWidth(50); btnRefreshServers->setFixedWidth(30);
connect(hps, SIGNAL(sigPublicServersDownloadedSuccessfully()), this, SLOT(rebuildComboBoxList())); connect(hps, SIGNAL(sigPublicServersDownloadedSuccessfully()), this, SLOT(rebuildComboBoxList()));
connect(hps, SIGNAL(sigPublicServersDownloadedUnsuccessfully(int)), this, SLOT(rebuildComboBoxList(int))); connect(hps, SIGNAL(sigPublicServersDownloadedUnsuccessfully(int)), this, SLOT(rebuildComboBoxList(int)));
@ -77,6 +77,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
serverIssuesLabel = serverIssuesLabel =
new QLabel(tr("If you have any trouble connecting or registering then contact the server staff for help!")); new QLabel(tr("If you have any trouble connecting or registering then contact the server staff for help!"));
serverIssuesLabel->setWordWrap(true); serverIssuesLabel->setWordWrap(true);
serverContactLabel = new QLabel(tr("Webpage") + ":");
serverContactLink = new QLabel; serverContactLink = new QLabel;
serverContactLink->setTextFormat(Qt::RichText); serverContactLink->setTextFormat(Qt::RichText);
serverContactLink->setTextInteractionFlags(Qt::TextBrowserInteraction); serverContactLink->setTextInteractionFlags(Qt::TextBrowserInteraction);
@ -120,8 +121,9 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
restrictionsGroupBox->setLayout(connectionLayout); restrictionsGroupBox->setLayout(connectionLayout);
serverInfoLayout = new QGridLayout; serverInfoLayout = new QGridLayout;
serverInfoLayout->addWidget(serverIssuesLabel, 0, 0); serverInfoLayout->addWidget(serverIssuesLabel, 0, 0, 1, 4, Qt::AlignTop);
serverInfoLayout->addWidget(serverContactLink, 1, 0); serverInfoLayout->addWidget(serverContactLabel, 1, 0);
serverInfoLayout->addWidget(serverContactLink, 1, 1, 1, 3);
loginLayout = new QGridLayout; loginLayout = new QGridLayout;
loginLayout->addWidget(playernameLabel, 0, 0); loginLayout->addWidget(playernameLabel, 0, 0);
@ -133,7 +135,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
loginGroupBox = new QGroupBox(tr("Login")); loginGroupBox = new QGroupBox(tr("Login"));
loginGroupBox->setLayout(loginLayout); loginGroupBox->setLayout(loginLayout);
serverInfoGroupBox = new QGroupBox(tr("Server info")); serverInfoGroupBox = new QGroupBox(tr("Server Contact"));
serverInfoGroupBox->setLayout(serverInfoLayout); serverInfoGroupBox->setLayout(serverInfoLayout);
btnGroupBox = new QGroupBox(tr("")); btnGroupBox = new QGroupBox(tr(""));
@ -141,8 +143,8 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
grid = new QGridLayout; grid = new QGridLayout;
grid->addWidget(restrictionsGroupBox, 0, 0); grid->addWidget(restrictionsGroupBox, 0, 0);
grid->addWidget(loginGroupBox, 1, 0); grid->addWidget(serverInfoGroupBox, 1, 0);
grid->addWidget(serverInfoGroupBox, 2, 0); grid->addWidget(loginGroupBox, 2, 0);
grid->addWidget(btnGroupBox, 3, 0); grid->addWidget(btnGroupBox, 3, 0);
mainLayout = new QVBoxLayout; mainLayout = new QVBoxLayout;
@ -232,6 +234,8 @@ void DlgConnect::previousHostSelected(bool state)
{ {
if (state) { if (state) {
saveEdit->setDisabled(true); saveEdit->setDisabled(true);
hostEdit->setDisabled(true);
portEdit->setDisabled(true);
previousHosts->setDisabled(false); previousHosts->setDisabled(false);
btnRefreshServers->setDisabled(false); btnRefreshServers->setDisabled(false);
} }
@ -259,9 +263,11 @@ void DlgConnect::updateDisplayInfo(const QString &saveName)
} }
if (!data.at(6).isEmpty()) { if (!data.at(6).isEmpty()) {
QString formattedLink = "<a href=\"" + data.at(6) + "\">" + data.at(0) + "</a>"; QString formattedLink = "<a href=\"" + data.at(6) + "\">" + data.at(6) + "</a>";
serverContactLabel->setText(tr("Webpage") + ":");
serverContactLink->setText(formattedLink); serverContactLink->setText(formattedLink);
} else { } else {
serverContactLabel->setText("");
serverContactLink->setText(""); serverContactLink->setText("");
} }
} }
@ -272,13 +278,18 @@ void DlgConnect::newHostSelected(bool state)
previousHosts->setDisabled(true); previousHosts->setDisabled(true);
btnRefreshServers->setDisabled(true); btnRefreshServers->setDisabled(true);
hostEdit->clear(); hostEdit->clear();
hostEdit->setPlaceholderText("Server URL");
hostEdit->setDisabled(false);
portEdit->clear(); portEdit->clear();
portEdit->setPlaceholderText("Communication Port");
portEdit->setDisabled(false);
playernameEdit->clear(); playernameEdit->clear();
passwordEdit->clear(); passwordEdit->clear();
savePasswordCheckBox->setChecked(false);
saveEdit->clear(); saveEdit->clear();
saveEdit->setPlaceholderText("New Menu Name"); saveEdit->setPlaceholderText("Unique Server Name");
saveEdit->setDisabled(false); saveEdit->setDisabled(false);
serverContactLabel->setText("");
serverContactLink->setText("");
} else { } else {
preRebuildComboBoxList(); preRebuildComboBoxList();
} }

3
cockatrice/src/dlg_connect.h
View file

@ -65,7 +65,8 @@ private:
QHBoxLayout *newHolderLayout; QHBoxLayout *newHolderLayout;
QGroupBox *loginGroupBox, *serverInfoGroupBox, *btnGroupBox, *restrictionsGroupBox; QGroupBox *loginGroupBox, *serverInfoGroupBox, *btnGroupBox, *restrictionsGroupBox;
QVBoxLayout *mainLayout; QVBoxLayout *mainLayout;
QLabel *hostLabel, *portLabel, *playernameLabel, *passwordLabel, *saveLabel, *serverIssuesLabel, *serverContactLink; QLabel *hostLabel, *portLabel, *playernameLabel, *passwordLabel, *saveLabel, *serverIssuesLabel,
*serverContactLabel, *serverContactLink;
QLineEdit *hostEdit, *portEdit, *playernameEdit, *passwordEdit, *saveEdit; QLineEdit *hostEdit, *portEdit, *playernameEdit, *passwordEdit, *saveEdit;
QCheckBox *savePasswordCheckBox, *autoConnectCheckBox; QCheckBox *savePasswordCheckBox, *autoConnectCheckBox;
QComboBox *previousHosts; QComboBox *previousHosts;