Used tr() function for auto-connect label. Changed formatting to adhere to coding style guidelines. 'Save Password' setting is now saved when cancelling the Connect dialog
This commit is contained in:
parent
b381298981
commit
ab83d6185a
2 changed files with 7 additions and 7 deletions
|
@ -34,8 +34,7 @@ DlgConnect::DlgConnect(QWidget *parent)
|
|||
savePasswordCheckBox = new QCheckBox(tr("&Save password"));
|
||||
savePasswordCheckBox->setChecked(settings.value("save_password", 1).toInt());
|
||||
|
||||
//autoConnectCheckBox = new QCheckBox(tr("A&uto connect at start"));
|
||||
autoConnectCheckBox = new QCheckBox("A&uto connect at start"); // TODO needs tr()
|
||||
autoConnectCheckBox = new QCheckBox(tr("A&uto connect at start"));
|
||||
if(savePasswordCheckBox->isChecked())
|
||||
{
|
||||
autoConnectCheckBox->setChecked(settings.value("auto_connect", 0).toInt());
|
||||
|
@ -76,12 +75,11 @@ DlgConnect::DlgConnect(QWidget *parent)
|
|||
|
||||
void DlgConnect::passwordSaved(int state)
|
||||
{
|
||||
if(!savePasswordCheckBox->isChecked())
|
||||
{
|
||||
if(savePasswordCheckBox->isChecked()) {
|
||||
autoConnectCheckBox->setEnabled(true);
|
||||
} else {
|
||||
autoConnectCheckBox->setChecked(0);
|
||||
autoConnectCheckBox->setEnabled(false);
|
||||
} else {
|
||||
autoConnectCheckBox->setEnabled(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -104,7 +102,9 @@ void DlgConnect::actCancel()
|
|||
{
|
||||
QSettings settings;
|
||||
settings.beginGroup("server");
|
||||
settings.setValue("save_password", savePasswordCheckBox->isChecked() ? 1 : 0);
|
||||
settings.setValue("auto_connect", autoConnectCheckBox->isChecked() ? 1 : 0);
|
||||
settings.endGroup();
|
||||
|
||||
reject();
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ SettingsCache::SettingsCache()
|
|||
|
||||
ignoreUnregisteredUsers = settings->value("chat/ignore_unregistered", false).toBool();
|
||||
|
||||
attemptAutoConnect = settings->value("server/auto_connect", 0).toInt() == 0 ? false : true;
|
||||
attemptAutoConnect = settings->value("server/auto_connect", 0).toBool();
|
||||
}
|
||||
|
||||
void SettingsCache::setLang(const QString &_lang)
|
||||
|
|
Loading…
Reference in a new issue