Changeset 1960

Timestamp:

07/08/12 01:26:08 (11 months ago)

Author:

philmoz

Message:

Convert ALT help text to language strings.

Location:

branches/philmoz-uitest

Files:

• CHDK/LANG/english.lng (modified) (1 diff)
• core/gui.c (modified) (3 diffs)
• core/gui_lang.h (modified) (1 diff)

branches/philmoz-uitest/CHDK/LANG/english.lng

@@ -681 +681 @@
 557 "  Help Screen Delay"
 558 "CHDK Settings"
+
+// <ALT> mode help screen text
+559 "%-20s %-14s"                           // Header format, adjust if needed; but total len must be 35
+560 "<ALT> Shortcuts"                       // Len must be <= first string in header format (20)
+561 "Shutter Half Press +"                  // Len must be <= first string in header format (20)
+562 "MENU=CHDK Menu"                        // Len must be <= second string in header format (14)
+563 "MENU=User Menu"                        // Len must be <= second string in header format (14)
+564 "SET=Script Menu, SHUTTER=Run Script"   // Len must be <= 35
+565 "Focus  %5s=Inf.  %5s=HyperFocal"       // Len must be <= 35
+566 "Manual Focus"
+567 "Hide CHDK OSD while pressed"
+568 "  * - not available in <ALT> mode  "   // Len must be <= 35

branches/philmoz-uitest/core/gui.c

@@ -2134 +2134 @@
 }
 
-static int shortcut_text(int x, int y, int button, int func_str, const char *state)
+static int shortcut_text(int x, int y, int button, int func_str, const char *state, color col)
 {
     buf[0] = 0;
-    sprintf(buf,"%-5s %20s",gui_shortcut_text(button),lang_str(func_str));
-    buf[26] = 0;
     if (state)
     {
+        sprintf(buf,"%-5s %20s",gui_shortcut_text(button),lang_str(func_str));
+        buf[26] = 0;
         sprintf(buf+strlen(buf)," [%6s",state);
         buf[34] = 0;
         strcat(buf,"]");
     }
+    else if (button)
+    {
+        sprintf(buf,"%-5s %29s",gui_shortcut_text(button),lang_str(func_str));
+    }
     else
-        strcat(buf,"         ");
-    draw_string(x, y, buf, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+    {
+        sprintf(buf,"%-35s",lang_str(func_str));
+    }
+    buf[35] = 0;
+    draw_string(x, y, buf, col);
     return y + FONT_HEIGHT;
 }
@@ -2178 +2185 @@
     int x = ((CAM_SCREEN_WIDTH/2)-(FONT_WIDTH*35/2));
 
-    if (conf.user_menu_enable && conf.user_menu_as_root)
-        draw_string(x, y, "<ALT> Shortcuts      MENU=User Menu", MAKE_COLOR(COLOR_FG, COLOR_ALT_BG));
-    else
-        draw_string(x, y, "<ALT> Shortcuts      MENU=CHDK Menu", MAKE_COLOR(COLOR_FG, COLOR_ALT_BG));
+    sprintf(buf,lang_str(LANG_HELP_HEADER),
+            lang_str(LANG_HELP_ALT_SHORTCUTS),
+            (conf.user_menu_enable && conf.user_menu_as_root)?lang_str(LANG_HELP_USER_MENU):lang_str(LANG_HELP_CHDK_MENU)); 
+    buf[35] = 0;
+    draw_string(x, y, buf, MAKE_COLOR(COLOR_FG, COLOR_ALT_BG));
     y += FONT_HEIGHT;
-    if (conf.user_menu_enable)
-    {
-        if (conf.user_menu_as_root)
-            draw_string(x, y, "Shutter Half Press + MENU=CHDK Menu", MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
-        else
-            draw_string(x, y, "Shutter Half Press + MENU=User Menu", MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
-        y += FONT_HEIGHT;
-    }
-    draw_string(x, y, "SET=Script Menu, SHUTTER=Run Script", MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+
+    sprintf(buf,lang_str(LANG_HELP_HEADER),
+            lang_str(LANG_HELP_HALF_PRESS),
+            (conf.user_menu_enable)?((conf.user_menu_enable && conf.user_menu_as_root)?lang_str(LANG_HELP_CHDK_MENU):lang_str(LANG_HELP_USER_MENU)):""); 
+    buf[35] = 0;
+    draw_string(x, y, buf, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
     y += FONT_HEIGHT;
 
+    draw_string(x, y, lang_str(LANG_HELP_SCRIPTS), MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+    y += FONT_HEIGHT;
+
 #if !defined(CAM_HAS_MANUAL_FOCUS) && defined(SHORTCUT_MF_TOGGLE)
-    y = shortcut_text(x, y, SHORTCUT_MF_TOGGLE,(int)"Manual Focus",gui_on_off_enum(0,&conf.subj_dist_override_koef));
+    y = shortcut_text(x, y, SHORTCUT_MF_TOGGLE,LANG_HELP_MANUAL_FOCUS,gui_on_off_enum(0,&conf.subj_dist_override_koef), MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
 #endif
 
     if (shooting_get_common_focus_mode())           // Check in manual focus mode
     {
-        sprintf(buf,"Focus  %5s=Inf.  %5s=HyperFocal",gui_shortcut_text(SHORTCUT_SET_INFINITY),gui_shortcut_text(SHORTCUT_SET_HYPERFOCAL));
+        sprintf(buf,lang_str(LANG_HELP_FOCUS),gui_shortcut_text(SHORTCUT_SET_INFINITY),gui_shortcut_text(SHORTCUT_SET_HYPERFOCAL));
         draw_string(x, y, buf, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
         y += FONT_HEIGHT;
@@ -2207 +2215 @@
 #ifdef OPT_DEBUGGING
     if (conf.debug_shortcut_action)
-        y = shortcut_text(x, y, SHORTCUT_TOGGLE_RAW,LANG_MENU_DEBUG_SHORTCUT_ACTION,gui_debug_shortcut_modes[conf.debug_shortcut_action]);
+        y = shortcut_text(x, y, SHORTCUT_TOGGLE_RAW,LANG_MENU_DEBUG_SHORTCUT_ACTION,gui_debug_shortcut_modes[conf.debug_shortcut_action], MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
     else
 #endif
-        y = shortcut_text(x, y, SHORTCUT_TOGGLE_RAW,LANG_MENU_RAW_SAVE,(conf.save_raw?(conf.dng_raw?"DNG":"RAW"):"Off"));
-
-    draw_string(x, y, "Shutter Half Press +               ", MAKE_COLOR(COLOR_FG, COLOR_ALT_BG));
-    y += FONT_HEIGHT;
-
-    y = shortcut_text(x, y, SHORTCUT_DISABLE_OVERRIDES,LANG_MENU_OVERRIDE_DISABLE,gui_override_disable_modes[conf.override_disable]);
-    y = shortcut_text(x, y, SHORTCUT_TOGGLE_HISTO,LANG_MENU_HISTO_SHOW,gui_histo_show_modes[conf.show_histo]);
-    y = shortcut_text(x, y, SHORTCUT_TOGGLE_ZEBRA,LANG_MENU_ZEBRA_DRAW,gui_on_off_enum(0,&conf.zebra_draw));
-    y = shortcut_text(x, y, SHORTCUT_TOGGLE_OSD,LANG_MENU_OSD_SHOW,gui_on_off_enum(0,&conf.show_osd));
+        y = shortcut_text(x, y, SHORTCUT_TOGGLE_RAW,LANG_MENU_RAW_SAVE,(conf.save_raw?(conf.dng_raw?"DNG":"RAW"):"Off"), MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+
+    y = shortcut_text(x, y, 0 ,LANG_HELP_HALF_PRESS, 0, MAKE_COLOR(COLOR_FG, COLOR_ALT_BG));
+
+    y = shortcut_text(x, y, SHORTCUT_DISABLE_OVERRIDES,LANG_MENU_OVERRIDE_DISABLE,gui_override_disable_modes[conf.override_disable], MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+    y = shortcut_text(x, y, SHORTCUT_TOGGLE_HISTO,LANG_MENU_HISTO_SHOW,gui_histo_show_modes[conf.show_histo], MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+    y = shortcut_text(x, y, SHORTCUT_TOGGLE_ZEBRA,LANG_MENU_ZEBRA_DRAW,gui_on_off_enum(0,&conf.zebra_draw), MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
+    y = shortcut_text(x, y, SHORTCUT_TOGGLE_OSD,LANG_MENU_OSD_SHOW,gui_on_off_enum(0,&conf.show_osd), MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
 
     if (conf.hide_osd == 0)
-    {
-        sprintf(buf,"%-5s = Hide CHDK OSD while pressed",gui_shortcut_text(KEY_DISPLAY));
-        draw_string(x, y, buf, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
-        y += FONT_HEIGHT;
-    }
+        y = shortcut_text(x, y, KEY_DISPLAY, LANG_HELP_HIDE_OSD, 0, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
 
     if (is_menu_shortcut)
-    {
-        draw_string(x, y, "  * - not available in <ALT> mode  ", MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
-        y += FONT_HEIGHT;
-    }
+        y = shortcut_text(x, y, 0 ,LANG_HELP_NOT_ALT, 0, MAKE_COLOR(COLOR_ALT_BG, COLOR_FG));
 }
 

branches/philmoz-uitest/core/gui_lang.h

@@ -684 +684 @@
 #define LANG_MENU_CHDK_SETTINGS                 558
 
-#define GUI_LANG_ITEMS                          558
+// <ALT> mode help screen text
+#define LANG_HELP_HEADER                        559
+#define LANG_HELP_ALT_SHORTCUTS                 560
+#define LANG_HELP_HALF_PRESS                    561
+#define LANG_HELP_CHDK_MENU                     562
+#define LANG_HELP_USER_MENU                     563
+#define LANG_HELP_SCRIPTS                       564
+#define LANG_HELP_FOCUS                         565
+#define LANG_HELP_MANUAL_FOCUS                  566
+#define LANG_HELP_HIDE_OSD                      567
+#define LANG_HELP_NOT_ALT                       568
+
+#define GUI_LANG_ITEMS                          568
 
 //-------------------------------------------------------------------