Changeset 552

Show
Ignore:
Timestamp:
09/14/07 14:31:34 (1 year ago)
Author:
takkaria
Message:

Menus should use 1234567890 as little as possible for "tags". (closes #292)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/cmd4.c

    r542 r552  
    39533953static menu_action option_actions [] =  
    39543954{ 
    3955         {'1', "Interface options", do_cmd_options_aux, (void*)0},  
    3956         {'2', "Display options", do_cmd_options_aux, (void*)1}, 
    3957         {'3', "Warning and disturbance options", do_cmd_options_aux, (void*)2},  
    3958         {'4', "Birth (difficulty) options", do_cmd_options_aux, (void*)3},  
    3959         {'5', "Cheat options", do_cmd_options_aux, (void*)4},  
     3955        {'a', "Interface options", do_cmd_options_aux, (void*)0},  
     3956        {'b', "Display options", do_cmd_options_aux, (void*)1}, 
     3957        {'c', "Warning and disturbance options", do_cmd_options_aux, (void*)2},  
     3958        {'d', "Birth (difficulty) options", do_cmd_options_aux, (void*)3},  
     3959        {'e', "Cheat options", do_cmd_options_aux, (void*)4},  
    39603960        {0, 0, 0, 0}, /* Load and append */ 
    3961         {'W', "Subwindow display settings", (action_f) do_cmd_options_win, 0},  
    3962         {'S', "Item squelch settings", (action_f) do_cmd_options_item, 0},  
    3963         {'D', "Set base delay factor", (action_f) do_cmd_delay, 0},  
    3964         {'H', "Set hitpoint warning", (action_f) do_cmd_hp_warn, 0},  
     3961        {'w', "Subwindow display settings", (action_f) do_cmd_options_win, 0},  
     3962        {'s', "Item squelch settings", (action_f) do_cmd_options_item, 0},  
     3963        {'d', "Set base delay factor", (action_f) do_cmd_delay, 0},  
     3964        {'h', "Set hitpoint warning", (action_f) do_cmd_hp_warn, 0},  
    39653965        {0, 0, 0, 0}, /* Special choices */ 
    3966         {'L', "Load a user pref file", (action_f) do_cmd_pref_file_hack, (void*)20}, 
    3967         {'A', "Dump options", do_dump_options, 0},  
     3966        {'l', "Load a user pref file", (action_f) do_cmd_pref_file_hack, (void*)20}, 
     3967        {'o', "Dump options", do_dump_options, 0},  
    39683968        {0, 0, 0, 0}, /* Interact with */        
    3969         {'M', "Interact with macros (advanced)", (action_f) do_cmd_macros, 0}, 
    3970         {'V', "Interact with visuals (advanced)", (action_f) do_cmd_visuals, 0}, 
    3971         {'C', "Interact with colours (advanced)", (action_f) do_cmd_colors, 0}, 
     3969        {'m', "Interact with macros (advanced)", (action_f) do_cmd_macros, 0}, 
     3970        {'v', "Interact with visuals (advanced)", (action_f) do_cmd_visuals, 0}, 
     3971        {'c', "Interact with colours (advanced)", (action_f) do_cmd_colors, 0}, 
    39723972}; 
    39733973 
    …… 
    40534053static menu_item knowledge_actions[] = 
    40544054{ 
    4055         {{0, "Display object knowledge", do_cmd_knowledge_objects, 0}, '1'}, 
    4056         {{0, "Display artifact knowledge", do_cmd_knowledge_artifacts, 0}, '2'}, 
    4057         {{0, "Display ego item knowledge", do_cmd_knowledge_ego_items, 0}, '3'}, 
    4058         {{0, "Display monster knowledge", do_cmd_knowledge_monsters, 0}, '4'}, 
    4059         {{0, "Display feature knowledge", do_cmd_knowledge_features, 0}, '5'}, 
    4060         {{0, "Display self-knowledge", do_cmd_self_knowledge, 0}, '6'}, 
    4061         {{0, "Display hall of fame", do_cmd_knowledge_scores, 0}, '7'}, 
     4055        {{0, "Display object knowledge", do_cmd_knowledge_objects, 0}, 'a'}, 
     4056        {{0, "Display artifact knowledge", do_cmd_knowledge_artifacts, 0}, 'b'}, 
     4057        {{0, "Display ego item knowledge", do_cmd_knowledge_ego_items, 0}, 'c'}, 
     4058        {{0, "Display monster knowledge", do_cmd_knowledge_monsters, 0}, 'd'}, 
     4059        {{0, "Display feature knowledge", do_cmd_knowledge_features, 0}, 'e'}, 
     4060        {{0, "Display self-knowledge", do_cmd_self_knowledge, 0}, 'f'}, 
     4061        {{0, "Display hall of fame", do_cmd_knowledge_scores, 0}, 'g'}, 
    40624062}; 
    40634063 
    …… 
    41554155        menu->title = "Interact with macros"; 
    41564156        menu->cmd_keys = cmd_keys; 
    4157         menu->selections = default_choice; 
     4157        menu->selections = lower_case; 
    41584158        menu->menu_data = macro_actions; 
    41594159        menu->count = N_ELEMENTS(macro_actions); 
    …… 
    41664166        menu->title = "Interact with visuals"; 
    41674167        menu->cmd_keys = cmd_keys; 
    4168         menu->selections = default_choice; 
     4168        menu->selections = lower_case; 
    41694169        menu->menu_data = visual_menu_items; 
    41704170        menu->count = N_ELEMENTS(visual_menu_items); 
    …… 
    41774177        menu->title = "Interact with colors"; 
    41784178        menu->cmd_keys = cmd_keys; 
    4179         menu->selections = default_choice; 
     4179        menu->selections = lower_case; 
    41804180        menu->menu_data = color_events; 
    41814181        menu->count = N_ELEMENTS(color_events); 

  • trunk/src/ui-menu.c

    r542 r552  
    2121 
    2222/* Some useful constants */ 
    23 const char default_choice[] = 
    24         "1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; 
    25  
    2623const char lower_case[] = "abcdefghijklmnopqrstuvwxyz"; 
    2724const char upper_case[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";