mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
preferences: use std::string in struct preferences
This is a messy commit, because the "qPref" system relies heavily on QString, which means lots of conversions between the two worlds. Ultimately, I plan to base the preferences system on std::string and only convert to QString when pushing through Qt's property system or when writing into Qt's settings. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
82fc9de40b
commit
ccdd92aeb7
78 changed files with 645 additions and 694 deletions
|
@ -54,11 +54,11 @@ void PreferencesLanguage::refreshSettings()
|
|||
ui->languageSystemDefault->setChecked(prefs.locale.use_system_language);
|
||||
ui->timeFormatSystemDefault->setChecked(!prefs.time_format_override);
|
||||
ui->dateFormatSystemDefault->setChecked(!prefs.date_format_override);
|
||||
ui->timeFormatEntry->setCurrentText(prefs.time_format);
|
||||
ui->dateFormatEntry->setCurrentText(prefs.date_format);
|
||||
ui->shortDateFormatEntry->setText(prefs.date_format_short);
|
||||
ui->timeFormatEntry->setCurrentText(QString::fromStdString(prefs.time_format));
|
||||
ui->dateFormatEntry->setCurrentText(QString::fromStdString(prefs.date_format));
|
||||
ui->shortDateFormatEntry->setText(QString::fromStdString(prefs.date_format_short));
|
||||
QAbstractItemModel *m = ui->languageDropdown->model();
|
||||
QModelIndexList languages = m->match(m->index(0, 0), Qt::UserRole, QString(prefs.locale.lang_locale).replace("-", "_"));
|
||||
QModelIndexList languages = m->match(m->index(0, 0), Qt::UserRole, QString::fromStdString(prefs.locale.lang_locale).replace("-", "_"));
|
||||
if (languages.count())
|
||||
ui->languageDropdown->setCurrentIndex(languages.first().row());
|
||||
}
|
||||
|
@ -69,9 +69,9 @@ void PreferencesLanguage::syncSettings()
|
|||
QString currentText = ui->languageDropdown->currentText();
|
||||
|
||||
if (useSystemLang != ui->languageSystemDefault->isChecked() ||
|
||||
(!useSystemLang && currentText != prefs.locale.language)) {
|
||||
(!useSystemLang && currentText.toStdString() != prefs.locale.language)) {
|
||||
// remove the googlemaps cache folder on language change
|
||||
QDir googlecachedir(QString(system_default_directory()).append("/googlemaps"));
|
||||
QDir googlecachedir(QString::fromStdString(system_default_directory() + "/googlemaps"));
|
||||
googlecachedir.removeRecursively();
|
||||
|
||||
QMessageBox::warning(this, tr("Restart required"),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue