latest changes from gta5sync

This commit is contained in:
Syping 2017-10-12 22:21:45 +02:00
parent cfdc36d207
commit 4169e86f31
28 changed files with 943 additions and 773 deletions

View file

@ -171,17 +171,17 @@ void OptionsDialog::setupRadioButtons()
if (contentModeOk)
{
if (contentMode == 0)
switch (contentMode)
{
case 0:
ui->rbOpenWithSC->setChecked(true);
}
else if (contentMode == 1)
{
break;
case 1:
ui->rbOpenWithDC->setChecked(true);
}
else if (contentMode == 2)
{
break;
case 2:
ui->rbSelectWithSC->setChecked(true);
break;
}
}
}
@ -267,11 +267,7 @@ void OptionsDialog::applySettings()
TCInstance->loadTranslation(qApp);
}
#if QT_VERSION >= 0x050000
emit settingsApplied(newContentMode, ui->cbLanguage->currentData().toString());
#else
emit settingsApplied(newContentMode, ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()).toString());
#endif
emit settingsApplied(newContentMode, languageChanged);
if ((forceCustomFolder && ui->txtFolder->text() != currentCFolder) || (forceCustomFolder != currentFFolder && forceCustomFolder))
{