diff options
Diffstat (limited to 'rbutil/rbutilqt/themesinstallwindow.cpp')
-rw-r--r-- | rbutil/rbutilqt/themesinstallwindow.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp index e87d530c8c..daa910d6bf 100644 --- a/rbutil/rbutilqt/themesinstallwindow.cpp +++ b/rbutil/rbutilqt/themesinstallwindow.cpp | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "progressloggergui.h" | 26 | #include "progressloggergui.h" |
27 | #include "utils.h" | 27 | #include "utils.h" |
28 | #include "rbsettings.h" | 28 | #include "rbsettings.h" |
29 | #include "systeminfo.h" | 29 | #include "playerbuildinfo.h" |
30 | #include "rockboxinfo.h" | 30 | #include "rockboxinfo.h" |
31 | #include "version.h" | 31 | #include "version.h" |
32 | #include "Logger.h" | 32 | #include "Logger.h" |
@@ -84,7 +84,7 @@ void ThemesInstallWindow::downloadInfo() | |||
84 | LOG_INFO() << "downloading info to" << themesInfo.fileName(); | 84 | LOG_INFO() << "downloading info to" << themesInfo.fileName(); |
85 | themesInfo.close(); | 85 | themesInfo.close(); |
86 | 86 | ||
87 | QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString(); | 87 | QString infoUrl = PlayerBuildInfo::instance()->value(PlayerBuildInfo::ThemesInfoUrl).toString(); |
88 | infoUrl.replace("%TARGET%", | 88 | infoUrl.replace("%TARGET%", |
89 | RbSettings::value(RbSettings::CurrentPlatform).toString().split(".").at(0)); | 89 | RbSettings::value(RbSettings::CurrentPlatform).toString().split(".").at(0)); |
90 | infoUrl.replace("%REVISION%", installInfo.revision()); | 90 | infoUrl.replace("%REVISION%", installInfo.revision()); |
@@ -218,9 +218,9 @@ void ThemesInstallWindow::updateDetails(QListWidgetItem* cur, QListWidgetItem* p | |||
218 | iniDetails.beginGroup(cur->data(Qt::UserRole).toString()); | 218 | iniDetails.beginGroup(cur->data(Qt::UserRole).toString()); |
219 | 219 | ||
220 | QUrl img, txt; | 220 | QUrl img, txt; |
221 | txt = QUrl(QString(SystemInfo::value(SystemInfo::ThemesUrl).toString() + "/" | 221 | txt = QUrl(QString(PlayerBuildInfo::instance()->value(PlayerBuildInfo::ThemesUrl).toString() + "/" |
222 | + iniDetails.value("descriptionfile").toString())); | 222 | + iniDetails.value("descriptionfile").toString())); |
223 | img = QUrl(QString(SystemInfo::value(SystemInfo::ThemesUrl).toString() + "/" | 223 | img = QUrl(QString(PlayerBuildInfo::instance()->value(PlayerBuildInfo::ThemesUrl).toString() + "/" |
224 | + iniDetails.value("image").toString())); | 224 | + iniDetails.value("image").toString())); |
225 | 225 | ||
226 | QString text; | 226 | QString text; |
@@ -334,7 +334,7 @@ void ThemesInstallWindow::install() | |||
334 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); | 334 | QSettings iniDetails(themesInfo.fileName(), QSettings::IniFormat, this); |
335 | for(int i = 0; i < ui.listThemes->selectedItems().size(); i++) { | 335 | for(int i = 0; i < ui.listThemes->selectedItems().size(); i++) { |
336 | iniDetails.beginGroup(ui.listThemes->selectedItems().at(i)->data(Qt::UserRole).toString()); | 336 | iniDetails.beginGroup(ui.listThemes->selectedItems().at(i)->data(Qt::UserRole).toString()); |
337 | zip = SystemInfo::value(SystemInfo::ThemesUrl).toString() | 337 | zip = PlayerBuildInfo::instance()->value(PlayerBuildInfo::ThemesUrl).toString() |
338 | + "/" + iniDetails.value("archive").toString(); | 338 | + "/" + iniDetails.value("archive").toString(); |
339 | themes.append(zip); | 339 | themes.append(zip); |
340 | names.append("Theme: " + | 340 | names.append("Theme: " + |