mirror of
https://github.com/clementine-player/Clementine
synced 2025-02-01 11:56:45 +01:00
Using trUf8 instead of classic tr. Now displays the already translated strings (utf8) correctly. Fixes issue 1620
This commit is contained in:
parent
7c0569f2ae
commit
900cbcf001
@ -92,7 +92,7 @@ void Equalizer::ReloadSettings() {
|
||||
|
||||
// Selected preset
|
||||
QString selected_preset = s.value("selected_preset", "Custom").toString();
|
||||
QString selected_preset_display_name = QString(tr(selected_preset.toStdString().c_str()));
|
||||
QString selected_preset_display_name = QString(trUtf8(qPrintable(selected_preset)));
|
||||
int selected_index = ui_->preset->findText(selected_preset_display_name);
|
||||
if (selected_index != -1)
|
||||
ui_->preset->setCurrentIndex(selected_index);
|
||||
@ -127,7 +127,7 @@ void Equalizer::LoadDefaultPresets() {
|
||||
}
|
||||
|
||||
void Equalizer::AddPreset(const QString& name, const Params& params) {
|
||||
QString name_displayed = tr(name.toStdString().c_str());
|
||||
QString name_displayed = trUtf8(qPrintable(name));
|
||||
presets_[name] = params;
|
||||
if (ui_->preset->findText(name_displayed) == -1) {
|
||||
ui_->preset->addItem(name_displayed, // name to display (translated)
|
||||
@ -164,14 +164,14 @@ void Equalizer::SavePreset() {
|
||||
QString name = SaveCurrentPreset();
|
||||
if (!name.isEmpty()) {
|
||||
last_preset_ = name;
|
||||
ui_->preset->setCurrentIndex(ui_->preset->findText(tr(name.toStdString().c_str())));
|
||||
ui_->preset->setCurrentIndex(ui_->preset->findText(trUtf8(qPrintable(name))));
|
||||
}
|
||||
}
|
||||
|
||||
QString Equalizer::SaveCurrentPreset() {
|
||||
QString name = QInputDialog::getText(this, tr("Save preset"), tr("Name"),
|
||||
QLineEdit::Normal,
|
||||
tr(last_preset_.toStdString().c_str()));
|
||||
trUtf8(qPrintable(last_preset_)));;
|
||||
if (name.isEmpty())
|
||||
return QString();
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user