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:
parent
f22eccf91e
commit
ddc34803a0
|
@ -190,17 +190,9 @@ void TapeConfigDialog::createIcon(const QString &icon, const QString &text)
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void TapeConfigDialog::Apply()
|
void TapeConfigDialog::Apply()
|
||||||
{
|
{
|
||||||
switch (contentsWidget->currentRow())
|
|
||||||
{
|
|
||||||
case (0):
|
|
||||||
configurationPage->Apply();
|
configurationPage->Apply();
|
||||||
break;
|
|
||||||
case (1):
|
|
||||||
pathPage->Apply();
|
pathPage->Apply();
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
qApp->TapeSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c());
|
qApp->TapeSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c());
|
||||||
emit UpdateProperties();
|
emit UpdateProperties();
|
||||||
setResult(QDialog::Accepted);
|
setResult(QDialog::Accepted);
|
||||||
|
|
|
@ -191,23 +191,11 @@ void ConfigDialog::createIcon(const QString &icon, const QString &text)
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void ConfigDialog::Apply()
|
void ConfigDialog::Apply()
|
||||||
{
|
{
|
||||||
switch (contentsWidget->currentRow())
|
|
||||||
{
|
|
||||||
case (0):
|
|
||||||
configurationPage->Apply();
|
configurationPage->Apply();
|
||||||
break;
|
|
||||||
case (1):
|
|
||||||
patternPage->Apply();
|
patternPage->Apply();
|
||||||
break;
|
|
||||||
case (2):
|
|
||||||
communityPage->Apply();
|
communityPage->Apply();
|
||||||
break;
|
|
||||||
case (3):
|
|
||||||
pathPage->Apply();
|
pathPage->Apply();
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c());
|
qApp->ValentinaSettings()->GetOsSeparator() ? setLocale(QLocale::system()) : setLocale(QLocale::c());
|
||||||
emit UpdateProperties();
|
emit UpdateProperties();
|
||||||
setResult(QDialog::Accepted);
|
setResult(QDialog::Accepted);
|
||||||
|
|
|
@ -90,7 +90,6 @@ void CommunityPage::Apply()
|
||||||
settings->SetUsername(this->username->text());
|
settings->SetUsername(this->username->text());
|
||||||
settings->SetSavePassword(this->savePassword->isChecked());
|
settings->SetSavePassword(this->savePassword->isChecked());
|
||||||
settings->SetUserPassword(this->userpassword->text());
|
settings->SetUserPassword(this->userpassword->text());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue
Block a user