Add speech feedback to imageviewer plugin
Patch by Igor Poretsky
Change-Id: Ifcca7342d07f0d7fb90d282468f7e6576c13d36b
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index daf67a0..e531baf 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -15126,3 +15126,119 @@
*: "Press play to run battery bench or stop to cancel"
</voice>
</phrase>
+<phrase>
+ id: LANG_CANNOT_RESTART_PLAYBACK
+ desc: cannot restart playback splash in imageviewer
+ user: core
+ <source>
+ *: none
+ lcd_bitmap: "Cannot restart playback"
+ </source>
+ <dest>
+ *: none
+ lcd_bitmap: "Cannot restart playback"
+ </dest>
+ <voice>
+ *: none
+ lcd_bitmap: "Cannot restart playback"
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_ORDERED
+ desc: in the imageviewer settings menu
+ user: core
+ <source>
+ *: none
+ lcd_bitmap: "Ordered"
+ </source>
+ <dest>
+ *: none
+ lcd_bitmap: "Ordered"
+ </dest>
+ <voice>
+ *: none
+ lcd_bitmap: "Ordered"
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_DIFFUSION
+ desc: in the imageviewer settings menu
+ user: core
+ <source>
+ *: none
+ lcd_bitmap: "Diffusion"
+ </source>
+ <dest>
+ *: none
+ lcd_bitmap: "Diffusion"
+ </dest>
+ <voice>
+ *: none
+ lcd_bitmap: "Diffusion"
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_GRAYSCALE
+ desc: in the imageviewer settings menu
+ user: core
+ <source>
+ *: none
+ lcd_bitmap: "Grayscale"
+ </source>
+ <dest>
+ *: none
+ lcd_bitmap: "Grayscale"
+ </dest>
+ <voice>
+ *: none
+ lcd_bitmap: "Grayscale"
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_SLIDESHOW_MODE
+ desc: in the imageviewer settings menu
+ user: core
+ <source>
+ *: none
+ lcd_bitmap: "Toggle Slideshow Mode"
+ </source>
+ <dest>
+ *: none
+ lcd_bitmap: "Toggle Slideshow Mode"
+ </dest>
+ <voice>
+ *: none
+ lcd_bitmap: "Toggle Slide show Mode"
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_SLIDESHOW_TIME
+ desc: in the imageviewer settings menu
+ user: core
+ <source>
+ *: none
+ lcd_bitmap: "Slideshow Time"
+ </source>
+ <dest>
+ *: none
+ lcd_bitmap: "Slideshow Time"
+ </dest>
+ <voice>
+ *: none
+ lcd_bitmap: "Slide show Time"
+ </voice>
+</phrase>
+<phrase>
+ id: LANG_RETURN
+ desc: in various plugin menus
+ user: core
+ <source>
+ *: "Return"
+ </source>
+ <dest>
+ *: "Return"
+ </dest>
+ <voice>
+ *: "Return"
+ </voice>
+</phrase>
diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c
index 05d2770..c6d33da 100644
--- a/apps/plugins/imageviewer/imageviewer.c
+++ b/apps/plugins/imageviewer/imageviewer.c
@@ -218,19 +218,19 @@
static bool set_option_dithering(void)
{
static const struct opt_items dithering[DITHER_NUM_MODES] = {
- [DITHER_NONE] = { "Off", -1 },
- [DITHER_ORDERED] = { "Ordered", -1 },
- [DITHER_DIFFUSION] = { "Diffusion", -1 },
+ [DITHER_NONE] = { STR(LANG_OFF) },
+ [DITHER_ORDERED] = { STR(LANG_ORDERED) },
+ [DITHER_DIFFUSION] = { STR(LANG_DIFFUSION) },
};
- rb->set_option("Dithering (Jpeg)", &settings.jpeg_dither_mode, INT,
+ rb->set_option(rb->str(LANG_DITHERING), &settings.jpeg_dither_mode, INT,
dithering, DITHER_NUM_MODES, NULL);
return false;
}
-MENUITEM_FUNCTION(grayscale_item, 0, "Greyscale (Jpeg)",
+MENUITEM_FUNCTION(grayscale_item, 0, ID2P(LANG_GRAYSCALE),
set_option_grayscale, NULL, NULL, Icon_NOICON);
-MENUITEM_FUNCTION(dithering_item, 0, "Dithering (Jpeg)",
+MENUITEM_FUNCTION(dithering_item, 0, ID2P(LANG_DITHERING),
set_option_dithering, NULL, NULL, Icon_NOICON);
MAKE_MENU(display_menu, "Display Options", NULL, Icon_NOICON,
&grayscale_item, &dithering_item);
@@ -260,19 +260,20 @@
};
MENUITEM_STRINGLIST(menu, "Image Viewer Menu", NULL,
- "Return", "Toggle Slideshow Mode",
- "Change Slideshow Time",
+ ID2P(LANG_RETURN),
+ ID2P(LANG_SLIDESHOW_MODE),
+ ID2P(LANG_SLIDESHOW_TIME),
#ifdef USE_PLUG_BUF
- "Show Playback Menu",
+ ID2P(LANG_PLAYBACK_CONTROL),
#endif
#ifdef HAVE_LCD_COLOR
- "Display Options",
+ ID2P(LANG_MENU_DISPLAY_OPTIONS),
#endif
- "Quit");
+ ID2P(LANG_MENU_QUIT));
static const struct opt_items slideshow[2] = {
- { "Disable", -1 },
- { "Enable", -1 },
+ { STR(LANG_OFF) },
+ { STR(LANG_ON) },
};
result=rb->do_menu(&menu, NULL, NULL, false);
@@ -282,11 +283,11 @@
case MIID_RETURN:
break;
case MIID_TOGGLE_SS_MODE:
- rb->set_option("Toggle Slideshow", &iv_api.slideshow_enabled, BOOL,
+ rb->set_option(rb->str(LANG_SLIDESHOW_MODE), &iv_api.slideshow_enabled, BOOL,
slideshow , 2, NULL);
break;
case MIID_CHANGE_SS_MODE:
- rb->set_int("Slideshow Time", "s", UNIT_SEC,
+ rb->set_int(rb->str(LANG_SLIDESHOW_TIME), "s", UNIT_SEC,
&settings.ss_timeout, NULL, 1,
SS_MIN_TIMEOUT, SS_MAX_TIMEOUT, NULL);
break;
@@ -299,7 +300,7 @@
}
else
{
- rb->splash(HZ, "Cannot restart playback");
+ rb->splash(HZ, ID2P(LANG_CANNOT_RESTART_PLAYBACK));
}
break;
#endif