Ignore:
Timestamp:
04/11/12 04:38:05 (14 months ago)
Author:
philmoz
Message:

Merged revision(s) 1797 from trunk:
Add option to disable the 'zoom assist' button on the SX30 and SX40.

Location:
branches/release-1_0
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/release-1_0

    • Property svn:mergeinfo changed
      /trunkmerged: 1797

  • branches/release-1_0/core/gui.c

    r1785 r1798  
    576576#if CAM_ADJUSTABLE_ALT_BUTTON 
    577577    MENU_ITEM(0x22,LANG_MENU_MISC_ALT_BUTTON,               MENUITEM_ENUM,                  gui_alt_mode_button_enum,           0 ), 
     578#endif 
     579#if defined(CAM_ZOOM_ASSIST_BUTTON_CONTROL) 
     580    MENU_ITEM   (0x5c,LANG_MENU_MISC_ZOOM_ASSIST,           MENUITEM_BOOL,                  &conf.zoom_assist_button_disable,   0 ), 
    578581#endif 
    579582    MENU_ITEM   (0x5d,LANG_MENU_MISC_DISABLE_LCD_OFF,       MENUITEM_ENUM,                  gui_alt_power_enum,                 0 ), 
Note: See TracChangeset for help on using the changeset viewer.