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

updated connect dlg

Browse source
This commit is contained in:
poixen 2016-07-21 11:45:11 +02:00
parent b28b174056
commit 8d989ca7fb
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cockatrice/src/dlg_connect.cpp
View file

@ -53,7 +53,9 @@ DlgConnect::DlgConnect(QWidget *parent)
savePasswordCheckBox = new QCheckBox(tr("&Save password")); savePasswordCheckBox = new QCheckBox(tr("&Save password"));
savePasswordCheckBox->setChecked(settingsCache->servers().getSavePassword()); savePasswordCheckBox->setChecked(settingsCache->servers().getSavePassword());
autoConnectCheckBox = new QCheckBox(tr("A&uto connect at start")); autoConnectCheckBox = new QCheckBox(tr("A&uto connect"));
autoConnectCheckBox->setToolTip(tr("Automatically connect to the most recent login when Cockatrice opens"));
if(savePasswordCheckBox->isChecked()) if(savePasswordCheckBox->isChecked())
{ {
autoConnectCheckBox->setChecked(settingsCache->servers().getAutoConnect()); autoConnectCheckBox->setChecked(settingsCache->servers().getAutoConnect());
@ -74,6 +76,7 @@ DlgConnect::DlgConnect(QWidget *parent)
connectionLayout->addWidget(hostEdit, 3, 1); connectionLayout->addWidget(hostEdit, 3, 1);
connectionLayout->addWidget(portLabel, 4, 0); connectionLayout->addWidget(portLabel, 4, 0);
connectionLayout->addWidget(portEdit, 4, 1); connectionLayout->addWidget(portEdit, 4, 1);
connectionLayout->addWidget(autoConnectCheckBox, 5, 1);
QGroupBox *restrictionsGroupBox = new QGroupBox(tr("Server")); QGroupBox *restrictionsGroupBox = new QGroupBox(tr("Server"));
restrictionsGroupBox->setLayout(connectionLayout); restrictionsGroupBox->setLayout(connectionLayout);
@ -83,6 +86,7 @@ DlgConnect::DlgConnect(QWidget *parent)
loginLayout->addWidget(playernameEdit, 0, 1); loginLayout->addWidget(playernameEdit, 0, 1);
loginLayout->addWidget(passwordLabel, 1, 0); loginLayout->addWidget(passwordLabel, 1, 0);
loginLayout->addWidget(passwordEdit, 1, 1); loginLayout->addWidget(passwordEdit, 1, 1);
loginLayout->addWidget(savePasswordCheckBox, 2, 1);
QGroupBox *loginGroupBox = new QGroupBox(tr("Login")); QGroupBox *loginGroupBox = new QGroupBox(tr("Login"));
loginGroupBox->setLayout(loginLayout); loginGroupBox->setLayout(loginLayout);
@ -90,9 +94,7 @@ DlgConnect::DlgConnect(QWidget *parent)
QGridLayout *grid = new QGridLayout; QGridLayout *grid = new QGridLayout;
grid->addWidget(restrictionsGroupBox, 0, 0); grid->addWidget(restrictionsGroupBox, 0, 0);
grid->addWidget(loginGroupBox, 1, 0); grid->addWidget(loginGroupBox, 1, 0);
grid->addWidget(savePasswordCheckBox, 3, 0);
grid->addWidget(autoConnectCheckBox, 4, 0);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(actOk())); connect(buttonBox, SIGNAL(accepted()), this, SLOT(actOk()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(actCancel())); connect(buttonBox, SIGNAL(rejected()), this, SLOT(actCancel()));

2
cockatrice/src/shortcutssettings.cpp
View file

@ -140,7 +140,7 @@ void ShortcutsSettings::clearAllShortcuts()
void ShortcutsSettings::fillDefaultShorcuts() void ShortcutsSettings::fillDefaultShorcuts()
{ {
defaultShortCuts["MainWindow/aCheckCardUpdates"] = parseSequenceString(""); defaultShortCuts["MainWindow/aCheckCardUpdates"] = parseSequenceString("");
defaultShortCuts["MainWindow/aConnect"] = parseSequenceString(""); defaultShortCuts["MainWindow/aConnect"] = parseSequenceString("Ctrl+L");
defaultShortCuts["MainWindow/aDeckEditor"] = parseSequenceString(""); defaultShortCuts["MainWindow/aDeckEditor"] = parseSequenceString("");
defaultShortCuts["MainWindow/aDisconnect"] = parseSequenceString(""); defaultShortCuts["MainWindow/aDisconnect"] = parseSequenceString("");
defaultShortCuts["MainWindow/aExit"] = parseSequenceString(""); defaultShortCuts["MainWindow/aExit"] = parseSequenceString("");