summaryrefslogtreecommitdiffstats
path: root/apps/gui/skin_engine
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2012-07-05 22:44:13 +1000
committerJonathan Gordon <rockbox@jdgordon.info>2012-07-05 23:30:06 +1000
commit65f9df3083623484efccf502c33ecc959555d247 (patch)
tree6d55b2eb2d874166be00306a5cc3a7c67ebea227 /apps/gui/skin_engine
parentf6d6a4602c9bb94565f8bb421b465a06f215fb7d (diff)
downloadrockbox-65f9df3083623484efccf502c33ecc959555d247.tar.gz
rockbox-65f9df3083623484efccf502c33ecc959555d247.zip
skin_engine: Allow the %St() (setting) skin tag be used as a bar
%St(<setting name>) or %St(<bar tags>, setting, <setting name>) Change-Id: I71396d683634d4d1ad2357018c4029ecb4229677
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r--apps/gui/skin_engine/skin_display.c8
-rw-r--r--apps/gui/skin_engine/skin_parser.c27
-rw-r--r--apps/gui/skin_engine/skin_render.c1
-rw-r--r--apps/gui/skin_engine/wps_internals.h2
4 files changed, 38 insertions, 0 deletions
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 08d17a0258..4f491dea24 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -44,6 +44,7 @@
#include "audio.h"
#include "tagcache.h"
#include "list.h"
+#include "option_select.h"
#ifdef HAVE_LCD_BITMAP
#include "peakmeter.h"
@@ -145,6 +146,13 @@ void draw_progressbar(struct gui_wps *gwps, int line, struct progressbar *pb)
end = val - min;
length = max - min;
}
+ else if (pb->type == SKIN_TOKEN_SETTINGBAR)
+ {
+ int val, count;
+ get_setting_info_for_bar(pb->setting_id, &count, &val);
+ length = count - 1;
+ end = val;
+ }
#if CONFIG_TUNER
else if (in_radio_screen() || (get_radio_status() != FMRADIO_OFF))
{
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index f66961d488..cbc2ebed4e 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -736,6 +736,10 @@ static int parse_image_special(struct skin_element *element,
#endif /* HAVE_LCD_BITMAP */
+static int parse_progressbar_tag(struct skin_element* element,
+ struct wps_token *token,
+ struct wps_data *wps_data);
+
static int parse_setting_and_lang(struct skin_element *element,
struct wps_token *token,
struct wps_data *wps_data)
@@ -757,6 +761,13 @@ static int parse_setting_and_lang(struct skin_element *element,
return WPS_ERROR_INVALID_PARAM;
#endif
}
+ else if (element->params_count > 1)
+ {
+ if (element->params_count > 4)
+ return parse_progressbar_tag(element, token, wps_data);
+ else
+ return WPS_ERROR_INVALID_PARAM;
+ }
else
{
#ifndef __PCTOOL__
@@ -891,6 +902,7 @@ static int parse_progressbar_tag(struct skin_element* element,
pb->image = PTRTOSKINOFFSET(skin_buffer, NULL);
pb->slider = PTRTOSKINOFFSET(skin_buffer, NULL);
pb->backdrop = PTRTOSKINOFFSET(skin_buffer, NULL);
+ pb->setting_id = -1;
pb->invert_fill_direction = false;
pb->horizontal = true;
@@ -1015,6 +1027,19 @@ static int parse_progressbar_tag(struct skin_element* element,
else if (!strcmp(text, "notouch"))
suppress_touchregion = true;
#endif
+ else if (token->type == SKIN_TOKEN_SETTING && !strcmp(text, "setting"))
+ {
+ if (curr_param+1 < element->params_count)
+ {
+ curr_param++;
+ param++;
+ text = SKINOFFSETTOPTR(skin_buffer, param->data.text);
+#ifndef __PCTOOL__
+ if (find_setting_by_cfgname(text, &pb->setting_id) == NULL)
+ return WPS_ERROR_INVALID_PARAM;
+#endif
+ }
+ }
else if (curr_param == 4)
image_filename = text;
@@ -1060,6 +1085,8 @@ static int parse_progressbar_tag(struct skin_element* element,
token->type = SKIN_TOKEN_PEAKMETER_RIGHTBAR;
else if (token->type == SKIN_TOKEN_LIST_NEEDS_SCROLLBAR)
token->type = SKIN_TOKEN_LIST_SCROLLBAR;
+ else if (token->type == SKIN_TOKEN_SETTING)
+ token->type = SKIN_TOKEN_SETTINGBAR;
pb->type = token->type;
#ifdef HAVE_TOUCHSCREEN
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c
index bf7f03d738..0fdf6b019f 100644
--- a/apps/gui/skin_engine/skin_render.c
+++ b/apps/gui/skin_engine/skin_render.c
@@ -209,6 +209,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
#endif
case SKIN_TOKEN_VOLUMEBAR:
case SKIN_TOKEN_BATTERY_PERCENTBAR:
+ case SKIN_TOKEN_SETTINGBAR:
#ifdef HAVE_LCD_BITMAP
case SKIN_TOKEN_PROGRESSBAR:
case SKIN_TOKEN_TUNER_RSSI_BAR:
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index ab2bc3579e..8cd5d9cb60 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -112,6 +112,8 @@ struct progressbar {
OFFSETTYPE(struct gui_img *) slider;
bool horizontal;
OFFSETTYPE(struct gui_img *) backdrop;
+ int setting_id; /* for the setting bar type */
+
};
struct draw_rectangle {