Fix issue with Config dialog Apply button.

In some cases the Apply or OK buttons will not save settings because of section
that was active in the moment of applying. For example made change in one
section, change to another and click Apply. The change will not be applied.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-08-26 13:36:51 +03:00
parent f22eccf91e
commit ddc34803a0
3 changed files with 8 additions and 29 deletions

View File

@ -190,17 +190,9 @@ void TapeConfigDialog::createIcon(const QString &icon, const QString &text)
//---------------------------------------------------------------------------------------------------------------------
void TapeConfigDialog::Apply()
{
switch (contentsWidget->currentRow())
{
case (0):
configurationPage->Apply();
break;
case (1):
pathPage->Apply();
break;
default:
break;
}
configurationPage->Apply();
pathPage->Apply();
qApp->TapeSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c());
emit UpdateProperties();
setResult(QDialog::Accepted);

View File

@ -191,23 +191,11 @@ void ConfigDialog::createIcon(const QString &icon, const QString &text)
//---------------------------------------------------------------------------------------------------------------------
void ConfigDialog::Apply()
{
switch (contentsWidget->currentRow())
{
case (0):
configurationPage->Apply();
break;
case (1):
patternPage->Apply();
break;
case (2):
communityPage->Apply();
break;
case (3):
pathPage->Apply();
break;
default:
break;
}
configurationPage->Apply();
patternPage->Apply();
communityPage->Apply();
pathPage->Apply();
qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c());
emit UpdateProperties();
setResult(QDialog::Accepted);

View File

@ -90,7 +90,6 @@ void CommunityPage::Apply()
settings->SetUsername(this->username->text());
settings->SetSavePassword(this->savePassword->isChecked());
settings->SetUserPassword(this->userpassword->text());
}
//---------------------------------------------------------------------------------------------------------------------