diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index 8fe6395d7c..9e9c872fdd 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini @@ -9,7 +9,7 @@ font_url=http://download.rockbox.org/daily/fonts/rockbox-fonts.zip prog_name=rockbox bootloader_url=http://download.rockbox.org/bootloader themes_url=http://themes.rockbox.org/ -themes_info_url=http://themes.rockbox.org/rbutilqt.php?target=%TARGET% +themes_info_url=http://themes.rockbox.org/rbutilqt.php?target=%TARGET%&release=%RELEASE%&revision=%REVISION%&rbutilver=%RBUTILVER% manual_url=http://download.rockbox.org/daily/manual doom_url=http://download.rockbox.org/useful/rockdoom.zip voice_url=http://download.rockbox.org/daily/voices/ diff --git a/rbutil/rbutilqt/themesinstallwindow.cpp b/rbutil/rbutilqt/themesinstallwindow.cpp index 9a2c126ae8..935c703193 100644 --- a/rbutil/rbutilqt/themesinstallwindow.cpp +++ b/rbutil/rbutilqt/themesinstallwindow.cpp @@ -26,6 +26,8 @@ #include "utils.h" #include "rbsettings.h" #include "systeminfo.h" +#include "rockboxinfo.h" +#include "version.h" ThemesInstallWindow::ThemesInstallWindow(QWidget *parent) : QDialog(parent) { @@ -58,6 +60,18 @@ void ThemesInstallWindow::downloadInfo() { // try to get the current build information getter = new HttpGet(this); + RockboxInfo installInfo + = RockboxInfo(RbSettings::value(RbSettings::Mountpoint).toString()); + QString revision; + QString release; + // installInfo.version() holds either the revision (as r-) + // or the release version number. + if(installInfo.version().startsWith("r")) { + revision = installInfo.version().remove("r").replace(QRegExp("-.+$"), ""); + } + else { + release = installInfo.version(); + } themesInfo.open(); qDebug() << "[Themes] downloading info to" << themesInfo.fileName(); @@ -66,6 +80,9 @@ void ThemesInstallWindow::downloadInfo() QString infoUrl = SystemInfo::value(SystemInfo::ThemesInfoUrl).toString(); infoUrl.replace("%TARGET%", SystemInfo::value(SystemInfo::CurConfigureModel).toString()); + infoUrl.replace("%REVISION%", revision); + infoUrl.replace("%RELEASE%", release); + infoUrl.replace("%RBUTILVER%", VERSION); QUrl url = QUrl(infoUrl); qDebug() << "[Themes] Info URL:" << url << "Query:" << url.queryItems(); if(RbSettings::value(RbSettings::CacheOffline).toBool())