Changeset 321 for trunk/core/gui.c


Ignore:
Timestamp:
03/11/08 20:57:49 (5 years ago)
Author:
fingalo
Message:

+Added Ixus950sd850 from whoever's work
+Added user menu option for instant display on ALT

User menu. In OSD parameters.
To the user menu you can copy other menuitems to build your favorite menu. (Up to 10 entries)

  • User Menu Enable 'Off'.

User Menu not active.

  • User Menu Enable 'Edit'.

Goto to the User Menu and position on the line where you like to add entries.
Now just go to the menuitem (anywhere) you like to copy. Press FUNC/ERASE/SHOOT_HALF. It is now copied to usermenu (and you can select another and press FUNC/ERASE/SHOOT_HALF.
Pressing FUNC/ERASE/SHOOT_HALF (and 'Edit' mode) while in the User Menu will erase the menu item.

  • User Menu Enable 'On'.

Will replace the 'main menu' and use the 'user menu' as your first menu in ALT. Last entry is jump to Main Menu.

  • User Menu Enable 'On Direct'.

Will display the 'User Menu' as soon as you press ALT.
Pressing MENU now will display normal menu and now the 'normal' menu sequence follow. new

NOTE:
As cameras have different keyboards I used icz's proposal for the add key:
SHOOT_HALF for the following cameras:
ixus700_sd500, ixus800_sd700, a560, ixus850_sd800, ixus70_sd1000, ixus950_sd850
FUNC / ERASE for the rest.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/core/gui.c

    r316 r321  
    3939// #define KEY_NONE (KEY_DUMMY+1) 
    4040 
    41 #if   defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_a560) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus55_sd450) 
     41#if   defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_a560) || defined(CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_ixus950_sd850) || defined(CAMERA_ixus55_sd450) 
    4242//Alt mode 
    4343 #define SHORTCUT_TOGGLE_RAW          KEY_DISPLAY 
    … …  
    233233#endif 
    234234    {LANG_MENU_MISC_SHOW_SPLASH,        MENUITEM_BOOL,    &conf.splash_show }, 
    235 #if !defined(CAMERA_g7) && !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) && !defined (CAMERA_ixus850_sd800)  && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a460) && !defined(CAMERA_ixus55_sd450) 
     235#if !defined(CAMERA_g7) && !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) && !defined (CAMERA_ixus850_sd800)  && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_ixus950_sd850) && !defined (CAMERA_a460) && !defined(CAMERA_ixus55_sd450) 
    236236    {LANG_MENU_MISC_ZOOM_FOR_MF,        MENUITEM_BOOL,    &conf.use_zoom_mf }, 
    237237#endif 
    … …  
    337337static CMenuItem bracketing_in_continuous_submenu_items[] = { 
    338338          {LANG_MENU_TV_BRACKET_VALUE,             MENUITEM_ENUM,    (int*)gui_tv_bracket_values_enum }, 
    339 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) && !defined(CAMERA_ixus55_sd450) 
     339#if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_ixus950_sd850) && !defined (CAMERA_a560) && !defined (CAMERA_a460) && !defined(CAMERA_ixus55_sd450) 
    340340          {LANG_MENU_AV_BRACKET_VALUE,             MENUITEM_ENUM,    (int*)gui_av_bracket_values_enum }, 
    341341#endif     
    … …  
    368368          {LANG_MENU_OVERRIDE_TV_KOEF,         MENUITEM_ENUM,    (int*)gui_tv_override_koef_enum}, 
    369369          {LANG_MENU_TV_ENUM_TYPE,             MENUITEM_ENUM,    (int*)gui_tv_enum_type_enum}, 
    370 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a460) && !defined(CAMERA_ixus55_sd450) 
     370#if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_ixus950_sd850) && !defined (CAMERA_a460) && !defined(CAMERA_ixus55_sd450) 
    371371          {LANG_MENU_OVERRIDE_AV_VALUE,        MENUITEM_ENUM,    (int*)gui_av_override_enum }, 
    372372#endif     
    373 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a570) ||  defined (CAMERA_g7) || defined (CAMERA_a460) || defined(CAMERA_ixus55_sd450) 
     373#if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_ixus950_sd850) || defined (CAMERA_a560) || defined (CAMERA_a570) ||  defined (CAMERA_g7) || defined (CAMERA_a460) || defined(CAMERA_ixus55_sd450) 
    374374      {LANG_MENU_OVERRIDE_ND_FILTER,       MENUITEM_ENUM,    (int*)gui_nd_filter_state_enum }, 
    375375#endif       
    … …  
    533533 
    534534static CMenu root_menu = { LANG_MENU_MAIN_TITLE, NULL, root_menu_items }; 
     535static int gui_user_menu_flag; 
    535536 
    536537void rinit(){ 
    … …  
    11011102 
    11021103const char* gui_user_menu_show_enum(int change, int arg) { 
    1103     static const char* modes[]={ "Off", "On", "Edit" }; 
    1104  
    1105         if (conf.user_menu_enable == 2) user_menu_save(); 
     1104    static const char* modes[]={ "Off", "On","On Direct", "Edit" }; 
     1105 
     1106        if (conf.user_menu_enable == 3) user_menu_save(); 
    11061107 
    11071108    conf.user_menu_enable+=change; 
    … …  
    13341335                conf_save_new_settings_if_changed(); 
    13351336#endif 
     1337                                if (gui_user_menu_flag) { 
     1338                        gui_mode = GUI_MODE_MENU; 
     1339                                        gui_user_menu_flag = 0; 
     1340                                        gui_menu_init(&root_menu); 
     1341                                } 
     1342                                else 
    13361343                gui_mode = GUI_MODE_ALT; 
    13371344                draw_restore(); 
    … …  
    13651372            if (kbd_is_key_clicked(SHORTCUT_TOGGLE_RAW)) { 
    13661373                if (conf.ns_enable_memdump) dump_memory();  
    1367 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a460) || defined(CAMERA_ixus55_sd450) 
     1374#if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_ixus950_sd850) || defined (CAMERA_a560) || defined (CAMERA_a460) || defined(CAMERA_ixus55_sd450) 
    13681375                else if (!shooting_get_common_focus_mode()) 
    13691376#else                 
    … …  
    13801387                  gui_subj_dist_override_koef_enum(1,0); 
    13811388                                  } 
    1382 #elif defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined(CAMERA_ixus55_sd450) 
     1389#elif defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_ixus950_sd850) || defined (CAMERA_a560) || defined(CAMERA_ixus55_sd450) 
    13831390                else 
    13841391                                  { 
    … …  
    13921399                draw_restore(); 
    13931400            } else { 
    1394 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a460) || defined(CAMERA_ixus55_sd450) 
     1401#if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_ixus950_sd850) || defined (CAMERA_a560) || defined (CAMERA_a460) || defined(CAMERA_ixus55_sd450) 
    13951402                        if (kbd_is_key_clicked(SHORTCUT_MF_TOGGLE)) { 
    13961403                              if (conf.subj_dist_override_koef>0) 
    … …  
    14081415                                if (kbd_is_key_clicked(KEY_RIGHT)) { 
    14091416                                  gui_subj_dist_override_koef_enum(1,0); 
    1410 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined(CAMERA_ixus55_sd450) 
     1417#if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_ixus950_sd850) || defined (CAMERA_a560) || defined(CAMERA_ixus55_sd450) 
    14111418                  if (conf.subj_dist_override_koef==0) conf.subj_dist_override_koef=1; 
    14121419#endif 
    … …  
    14161423                                  { 
    14171424                                  gui_subj_dist_override_koef_enum(-1,0); 
    1418 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined(CAMERA_ixus55_sd450) 
     1425#if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_ixus950_sd850) || defined (CAMERA_a560) || defined(CAMERA_ixus55_sd450) 
    14191426                  if (conf.subj_dist_override_koef==0) conf.subj_dist_override_koef=1; 
    14201427#endif 
    … …  
    15121519    } 
    15131520    gui_mode = GUI_MODE_ALT; 
     1521 
     1522        gui_user_menu_flag = 0; 
     1523        if (conf.user_menu_enable == 2) { 
     1524                gui_menu_init(&user_submenu); 
     1525                gui_mode = GUI_MODE_MENU; 
     1526                draw_restore(); 
     1527                gui_user_menu_flag = 1; 
     1528        } 
     1529 
    15141530} 
    15151531 
    … …  
    16241640        return; 
    16251641    } 
    1626 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) && !defined(CAMERA_ixus55_sd450) 
     1642#if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_ixus950_sd850) && !defined (CAMERA_a560) && !defined (CAMERA_a460) && !defined(CAMERA_ixus55_sd450) 
    16271643    if (!(conf.show_osd && (canon_menu_active==(int)&canon_menu_active-4) && (canon_shoot_menu_active==0)))  return;     
    16281644#else 
Note: See TracChangeset for help on using the changeset viewer.