summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-12-10 21:30:01 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-12-10 21:30:13 +0100
commit9ad1ef0e55981046f750fdb39f564b74663bc03a (patch)
tree8a2a8f9d2c449c5fa543800ab4ca9a6f46d58889
parent52d437b33ed95e7a10e022f62cbd7c18f4fbc433 (diff)
downloadrockbox-9ad1ef0e55981046f750fdb39f564b74663bc03a.tar.gz
rockbox-9ad1ef0e55981046f750fdb39f564b74663bc03a.zip
rbutil: Fix encoding for themes info data.
The themes info data uses utf-8 encoding, while QSettings defaults to ASCII and uses escape sequences, resulting in non-ASCII characters being garbled. Use the correct encoding. Change-Id: Ibee58b51926f6d7c3885dead0b42579e21bfb1db
-rw-r--r--rbutil/rbutilqt/themesinstallwindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp
index daa910d6bf..3b713c145f 100644
--- a/rbutil/rbutilqt/themesinstallwindow.cpp
+++ b/rbutil/rbutilqt/themesinstallwindow.cpp
@@ -116,6 +116,7 @@ void ThemesInstallWindow::downloadDone(bool error)
116 themesInfo.open(); 116 themesInfo.open();
117 117
118 QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); 118 QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this);
119 iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8"));
119 QStringList tl = iniDetails.childGroups(); 120 QStringList tl = iniDetails.childGroups();
120 LOG_INFO() << "Theme site result:" 121 LOG_INFO() << "Theme site result:"
121 << iniDetails.value("error/code").toString() 122 << iniDetails.value("error/code").toString()
@@ -189,6 +190,7 @@ void ThemesInstallWindow::updateSize(void)
189 long size = 0; 190 long size = 0;
190 // sum up size for all selected themes 191 // sum up size for all selected themes
191 QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); 192 QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this);
193 iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8"));
192 int items = ui.listThemes->selectedItems().size(); 194 int items = ui.listThemes->selectedItems().size();
193 for(int i = 0; i < items; i++) { 195 for(int i = 0; i < items; i++) {
194 iniDetails.beginGroup(ui.listThemes->selectedItems() 196 iniDetails.beginGroup(ui.listThemes->selectedItems()
@@ -207,6 +209,7 @@ void ThemesInstallWindow::updateDetails(QListWidgetItem* cur, QListWidgetItem* p
207 return; 209 return;
208 210
209 QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); 211 QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this);
212 iniDetails.setIniCodec(QTextCodec::codecForName("UTF-8"));
210 213
211 QCoreApplication::processEvents(); 214 QCoreApplication::processEvents();
212 ui.themeDescription->setText(tr("fetching details for %1") 215 ui.themeDescription->setText(tr("fetching details for %1")