diff options
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.cpp | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/systeminfo.h | 5 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 5 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 32 |
4 files changed, 37 insertions, 8 deletions
diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp index c1bb35ab4d..b493168699 100644 --- a/rbutil/rbutilqt/base/systeminfo.cpp +++ b/rbutil/rbutilqt/base/systeminfo.cpp | |||
@@ -37,7 +37,8 @@ const static struct { | |||
37 | { SystemInfo::BleedingUrl, "bleeding_url", "" }, | 37 | { SystemInfo::BleedingUrl, "bleeding_url", "" }, |
38 | { SystemInfo::BootloaderUrl, "bootloader_url", "" }, | 38 | { SystemInfo::BootloaderUrl, "bootloader_url", "" }, |
39 | { SystemInfo::BootloaderInfoUrl, "bootloader_info_url", "" }, | 39 | { SystemInfo::BootloaderInfoUrl, "bootloader_info_url", "" }, |
40 | { SystemInfo::FontUrl, "font_url", "" }, | 40 | { SystemInfo::ReleaseFontUrl, "release_font_url", "" }, |
41 | { SystemInfo::DailyFontUrl, "daily_font_url", "" }, | ||
41 | { SystemInfo::DailyVoiceUrl, "daily_voice_url", "" }, | 42 | { SystemInfo::DailyVoiceUrl, "daily_voice_url", "" }, |
42 | { SystemInfo::ReleaseVoiceUrl, "release_voice_url", "" }, | 43 | { SystemInfo::ReleaseVoiceUrl, "release_voice_url", "" }, |
43 | { SystemInfo::DoomUrl, "doom_url", "" }, | 44 | { SystemInfo::DoomUrl, "doom_url", "" }, |
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h index 5e5b60770a..214e423a51 100644 --- a/rbutil/rbutilqt/base/systeminfo.h +++ b/rbutil/rbutilqt/base/systeminfo.h | |||
@@ -41,12 +41,13 @@ class SystemInfo : public QObject | |||
41 | BleedingUrl, | 41 | BleedingUrl, |
42 | BootloaderUrl, | 42 | BootloaderUrl, |
43 | BootloaderInfoUrl, | 43 | BootloaderInfoUrl, |
44 | FontUrl, | 44 | DailyUrl, |
45 | DailyFontUrl, | ||
45 | DailyVoiceUrl, | 46 | DailyVoiceUrl, |
46 | DoomUrl, | 47 | DoomUrl, |
47 | ReleaseUrl, | 48 | ReleaseUrl, |
48 | ReleaseVoiceUrl, | 49 | ReleaseVoiceUrl, |
49 | DailyUrl, | 50 | ReleaseFontUrl, |
50 | ServerConfUrl, | 51 | ServerConfUrl, |
51 | GenlangUrl, | 52 | GenlangUrl, |
52 | ThemesUrl, | 53 | ThemesUrl, |
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini index 273486fc2a..8f1591ac9c 100644 --- a/rbutil/rbutilqt/rbutil.ini +++ b/rbutil/rbutilqt/rbutil.ini | |||
@@ -20,7 +20,10 @@ themes_info_url=http://themes.rockbox.org/rbutilqt.php?target=%TARGET%&release=% | |||
20 | ; server information | 20 | ; server information |
21 | server_conf_url=http://download.rockbox.org/daily/build-info | 21 | server_conf_url=http://download.rockbox.org/daily/build-info |
22 | bleeding_info=http://build.rockbox.org/cvsmod/build-info | 22 | bleeding_info=http://build.rockbox.org/cvsmod/build-info |
23 | font_url=http://download.rockbox.org/daily/fonts/rockbox-fonts.zip | 23 | |
24 | ; fonts | ||
25 | release_font_url=http://download.rockbox.org/release/%RELEASEVER%/rockbox-fonts-%RELEASEVER%.zip | ||
26 | daily_font_url=http://download.rockbox.org/daily/fonts/rockbox-fonts.zip | ||
24 | 27 | ||
25 | ; other | 28 | ; other |
26 | manual_url=http://download.rockbox.org/daily/manual | 29 | manual_url=http://download.rockbox.org/daily/manual |
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index d503da00e4..4485bacaec 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -798,6 +798,15 @@ void RbUtilQt::installBootloaderPost(bool error) | |||
798 | void RbUtilQt::installFontsBtn() | 798 | void RbUtilQt::installFontsBtn() |
799 | { | 799 | { |
800 | if(chkConfig(true)) return; | 800 | if(chkConfig(true)) return; |
801 | QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); | ||
802 | RockboxInfo installInfo(mountpoint); | ||
803 | if(installInfo.revision().isEmpty() && installInfo.release().isEmpty()) { | ||
804 | QMessageBox::critical(this, tr("No Rockbox installation found"), | ||
805 | tr("Could not determine the installed Rockbox version. " | ||
806 | "Please install a Rockbox build before installing " | ||
807 | "fonts.")); | ||
808 | return; | ||
809 | } | ||
801 | if(QMessageBox::question(this, tr("Confirm Installation"), | 810 | if(QMessageBox::question(this, tr("Confirm Installation"), |
802 | tr("Do you really want to install the fonts package?"), | 811 | tr("Do you really want to install the fonts package?"), |
803 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; | 812 | QMessageBox::Yes | QMessageBox::No) != QMessageBox::Yes) return; |
@@ -816,13 +825,28 @@ bool RbUtilQt::installFontsAuto() | |||
816 | 825 | ||
817 | void RbUtilQt::installFonts() | 826 | void RbUtilQt::installFonts() |
818 | { | 827 | { |
828 | QString mountpoint = RbSettings::value(RbSettings::Mountpoint).toString(); | ||
829 | RockboxInfo installInfo(mountpoint); | ||
830 | QString fontsurl; | ||
831 | QString logversion; | ||
832 | QString relversion = installInfo.release(); | ||
833 | if(relversion.isEmpty()) { | ||
834 | // release is empty for non-release versions (i.e. daily / current) | ||
835 | fontsurl = SystemInfo::value(SystemInfo::DailyFontUrl).toString(); | ||
836 | logversion = installInfo.revision(); | ||
837 | } | ||
838 | else { | ||
839 | fontsurl = SystemInfo::value(SystemInfo::ReleaseFontUrl).toString(); | ||
840 | logversion = installInfo.release(); | ||
841 | } | ||
842 | fontsurl.replace("%RELEASEVER%", relversion); | ||
843 | |||
819 | // create zip installer | 844 | // create zip installer |
820 | installer = new ZipInstaller(this); | 845 | installer = new ZipInstaller(this); |
821 | 846 | installer->setUrl(fontsurl); | |
822 | installer->setUrl(SystemInfo::value(SystemInfo::FontUrl).toString()); | ||
823 | installer->setLogSection("Fonts"); | 847 | installer->setLogSection("Fonts"); |
824 | installer->setLogVersion(ServerInfo::value(ServerInfo::DailyDate).toString()); | 848 | installer->setLogVersion(logversion); |
825 | installer->setMountPoint(RbSettings::value(RbSettings::Mountpoint).toString()); | 849 | installer->setMountPoint(mountpoint); |
826 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) | 850 | if(!RbSettings::value(RbSettings::CacheDisabled).toBool()) |
827 | installer->setCache(true); | 851 | installer->setCache(true); |
828 | 852 | ||