summaryrefslogtreecommitdiff
path: root/apps/settings.c
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2008-03-21 19:38:00 +0000
committerDave Chapman <dave@dchapman.com>2008-03-21 19:38:00 +0000
commitd02c79c03fed154e8cdf4cbef8670221dfe922aa (patch)
treeae519730d242d0b9daadcf9daa10154beab682d5 /apps/settings.c
parent1544b36966c692e20d711b920eade06487996eb6 (diff)
downloadrockbox-d02c79c03fed154e8cdf4cbef8670221dfe922aa.tar.gz
rockbox-d02c79c03fed154e8cdf4cbef8670221dfe922aa.zip
Commit viewports-in-WPS patch (FS#8385). This adds the %V tag - see the CustomWPS page for details (shortly...). There is still some work to do - decide how to handle font references, decide how to handle conditionals. Plus checkwps is broken - I'll fix that in a separate commit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16733 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/settings.c b/apps/settings.c
index 6fb5e3ee47..449a38b96f 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -806,7 +806,7 @@ void settings_apply(bool read_disk)
806 global_settings.wps_file[0] != 0xff ) { 806 global_settings.wps_file[0] != 0xff ) {
807 snprintf(buf, sizeof buf, WPS_DIR "/%s.wps", 807 snprintf(buf, sizeof buf, WPS_DIR "/%s.wps",
808 global_settings.wps_file); 808 global_settings.wps_file);
809 wps_data_load(gui_wps[0].data, buf, true); 809 wps_data_load(gui_wps[0].data, &screens[0], buf, true);
810 } 810 }
811 else 811 else
812 { 812 {
@@ -835,7 +835,7 @@ void settings_apply(bool read_disk)
835 if ( global_settings.rwps_file[0]) { 835 if ( global_settings.rwps_file[0]) {
836 snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps", 836 snprintf(buf, sizeof buf, WPS_DIR "/%s.rwps",
837 global_settings.rwps_file); 837 global_settings.rwps_file);
838 wps_data_load(gui_wps[1].data, buf, true); 838 wps_data_load(gui_wps[1].data, &screens[1], buf, true);
839 } 839 }
840 else 840 else
841 { 841 {