Changeset 8358

Show
Ignore:
Timestamp:
03/02/12 14:54:17 (4 months ago)
Author:
westram
Message:
  • AWT_reactivate_all_advices
    • renamed into AW_reactivate_all_advices
    • moved into AW_insert_common_property_menu_entries
      • call this from all ARB applications
  • move properties menu rightmost in ARB_PARSIMONY
Location:
trunk
Files:
12 modified

Legend:

Unmodified
Added
Removed

  • trunk/DIST/DI_matr.cxx

    r8309 r8358  
    14601460    aws->create_menu("Properties", "P", AWM_ALL); 
    14611461    aws->insert_menu_topic("frame_props", "Frame ...",                  "F", "props_frame.hlp", AWM_ALL, AW_POPUP,(AW_CL)AW_preset_window,   0); 
     1462    aws->insert_separator(); 
     1463    AW_insert_common_property_menu_entries(aws); 
     1464    aws->insert_separator(); 
    14621465    aws->insert_menu_topic("save_props",  "Save Properties (dist.arb)", "S", "savedef.hlp",     AWM_ALL,          (AW_CB)AW_save_properties, 0, 0); 
    14631466 

  • trunk/EDIT4/ED4_root.cxx

    r8355 r8358  
    15371537 
    15381538    SEP________________________SEP; 
    1539     awmm->insert_menu_topic("enable_advices", "Reactivate advices",       "R", "advice.hlp", AWM_ALL, (AW_CB) AWT_reactivate_all_advices, 0, 0); 
    1540     SEP________________________SEP; 
    15411539 
    15421540    static AW_cb_struct *expose_cb = 0; 
    … …  
    15481546    awmm->insert_menu_topic("props_key_map", "Key Mappings ",              "K", "nekey_map.hlp", AWM_ALL, AW_POPUP, (AW_CL)create_key_map_window, 0); 
    15491547    awmm->insert_menu_topic("props_nds",     "Select visible info (NDS) ", "D", "ed4_nds.hlp",   AWM_ALL, AW_POPUP, (AW_CL)ED4_create_nds_window, 0); 
     1548    SEP________________________SEP; 
     1549    AW_insert_common_property_menu_entries(awmm); 
    15501550    SEP________________________SEP; 
    15511551    awmm->insert_sub_menu("Save properties ...", "a"); 

  • trunk/GENOM/GEN_map.cxx

    r8309 r8358  
    16591659    insert_menu_topic("gene_options",      "Options",  "O", "gene_options.hlp", AWM_ALL, AW_POPUP, (AW_CL)GEN_create_options_window, 0); 
    16601660    insert_menu_topic("gene_nds",          "NDS ( Select Gene Information ) ...",      "N", "props_nds.hlp",   AWM_ALL, AW_POPUP, (AW_CL)GEN_open_nds_window, (AW_CL)gb_main); 
     1661    insert_separator(); 
     1662    AW_insert_common_property_menu_entries(this); 
     1663    insert_separator(); 
    16611664    insert_menu_topic("gene_save_props",   "Save Defaults (ntree.arb)", "D", "savedef.hlp", AWM_ALL, (AW_CB) AW_save_properties, 0, 0); 
    16621665 

  • trunk/MERGE/MG_main.cxx

    r8355 r8358  
    242242        } 
    243243 
     244        awm->insert_separator(); 
     245        AW_insert_common_property_menu_entries(awm); 
     246        awm->insert_separator(); 
    244247        awm->insert_menu_topic("save_props", "Save properties (ntree.arb)", "p", "savedef.hlp", AWM_ALL, (AW_CB)AW_save_properties, 0, 0); 
    245248 

  • trunk/NTREE/NT_extern.cxx

    r8355 r8358  
    15671567            AWMIMT("props_www", "Search world wide web (WWW)", "W", "props_www.hlp", AWM_ALL, AW_POPUP, (AW_CL)AWT_open_www_window, (AW_CL)GLOBAL_gb_main); 
    15681568            SEP________________________SEP(); 
    1569             AWMIMT("enable_advices", "Reactivate advices",         "R", "advice.hlp", AWM_ALL, (AW_CB) AWT_reactivate_all_advices, 0, 0); 
    15701569            AWMIMT("!toggle_expert", "Toggle expert mode",         "x", 0,            AWM_ALL, NT_toggle_expert_mode,              0, 0); 
    15711570            AWMIMT("!toggle_focus",  "Toggle focus follows mouse", "f", 0,            AWM_ALL, NT_toggle_focus_policy,             0, 0); 
     1571            SEP________________________SEP(); 
     1572            AW_insert_common_property_menu_entries(awm); 
    15721573            SEP________________________SEP(); 
    15731574            AWMIMT("save_props", "Save properties (ntree.arb)", "S", "savedef.hlp", AWM_ALL, (AW_CB) AW_save_properties, 0, 0); 

  • trunk/PARSIMONY/PARS_main.cxx

    r8355 r8358  
    13881388#endif // TESTMENU 
    13891389 
     1390    awm->create_menu("Reset", "R", AWM_ALL); 
     1391    { 
     1392        awm->insert_menu_topic("reset_logical_zoom",    "Logical Zoom",   "L", "rst_log_zoom.hlp", AWM_ALL, (AW_CB)NT_reset_lzoom_cb, (AW_CL)ntw, 0); 
     1393        awm->insert_menu_topic("reset_physical_zoom",   "Physical Zoom",  "P", "rst_phys_zoom.hlp", AWM_ALL, (AW_CB)NT_reset_pzoom_cb, (AW_CL)ntw, 0); 
     1394    } 
     1395 
    13901396    awm->create_menu("Properties", "r", AWM_ALL); 
    13911397    { 
    … …  
    13941400        awm->insert_menu_topic("props_tree2", "Tree: Settings ...",         "T", "nt_tree_settings.hlp", AWM_ALL, AW_POPUP,(AW_CL)NT_create_tree_setting,  (AW_CL)ntw); 
    13951401        awm->insert_menu_topic("props_kl",    "KERN. LIN ...",              "K", "kernlin.hlp",          AWM_ALL, AW_POPUP,(AW_CL)create_kernighan_window, 0); 
     1402        awm->insert_separator(); 
     1403        AW_insert_common_property_menu_entries(awm); 
     1404        awm->insert_separator(); 
    13961405        awm->insert_menu_topic("save_props",  "Save Defaults (pars.arb)",   "D", "savedef.hlp",          AWM_ALL,          (AW_CB)AW_save_properties,      0, 0); 
    13971406    } 
    13981407    awm->button_length(5); 
    1399  
    1400     awm->create_menu("ETC", "E", AWM_ALL); 
    1401     { 
    1402         awm->insert_menu_topic("reset_logical_zoom",    "Reset Logical Zoom",   "L", "rst_log_zoom.hlp", AWM_ALL, (AW_CB)NT_reset_lzoom_cb, (AW_CL)ntw, 0); 
    1403         awm->insert_menu_topic("reset_physical_zoom",   "Reset Physical Zoom",  "P", "rst_phys_zoom.hlp", AWM_ALL, (AW_CB)NT_reset_pzoom_cb, (AW_CL)ntw, 0); 
    1404     } 
    14051408 
    14061409    awm->insert_help_topic("How to use Help",    "H", "help.hlp",     AWM_ALL, (AW_CB)AW_POPUP_HELP, (AW_CL)"help.hlp",     0); 

  • trunk/PHYLO/PH_main.cxx

    r8313 r8358  
    472472    awm->insert_menu_topic("props_menu", "Menu: Colors and Fonts ...",  "M", "props_frame.hlp",   AWM_ALL, AW_POPUP,(AW_CL)AW_preset_window,    0); 
    473473    awm->insert_menu_topic("props_data", "Data: Colors and Fonts ...",  "D", "ph_props_data.hlp", AWM_ALL, AW_POPUP,(AW_CL)AW_create_gc_window, (AW_CL)gcmiddle); 
     474    awm->insert_separator(); 
     475    AW_insert_common_property_menu_entries(awm); 
     476    awm->insert_separator(); 
    474477    awm->insert_menu_topic("save_props", "Save Properties (phylo.arb)", "S", "savedef.hlp",       AWM_ALL,          (AW_CB)AW_save_properties,  0, 0); 
    475478 

  • trunk/WINDOW/AW_advice.cxx

    r7888 r8358  
    138138// ------------------------------------------- 
    139139 
    140 void AWT_reactivate_all_advices() { 
     140void AW_reactivate_all_advices() { 
    141141    AW_awar *awar_disabled = get_disabled_advices(); 
    142142 

  • trunk/WINDOW/AW_preset.cxx

    r8309 r8358  
    10951095 
    10961096} 
     1097 
     1098static void add_common_property_menu_entries(AW_window *aw) { 
     1099    aw->insert_menu_topic("enable_advices", "Reactivate advices", "R", "advice.hlp", AWM_ALL, (AW_CB) AW_reactivate_all_advices, 0, 0); 
     1100} 
     1101void AW_insert_common_property_menu_entries(AW_window_menu_modes *awmm) { add_common_property_menu_entries(awmm); } 
     1102void AW_insert_common_property_menu_entries(AW_window_simple_menu *awsm) { add_common_property_menu_entries(awsm); } 

  • trunk/WINDOW/Makefile

    r8355 r8358  
    531531AW_window.o: aw_nawar.hxx 
    532532AW_window.o: aw_position.hxx 
     533AW_window.o: aw_question.hxx 
    533534AW_window.o: aw_root.hxx 
    534535AW_window.o: aw_scalar.hxx 

  • trunk/WINDOW/aw_advice.hxx

    r6867 r8358  
    4646 
    4747//! reactivates all advices which were disabled by the user 
    48 void AWT_reactivate_all_advices(); 
     48void AW_reactivate_all_advices(); 
    4949 
    5050 

  • trunk/WINDOW/aw_preset.hxx

    r8309 r8358  
    2727 
    2828AW_window *AW_preset_window(AW_root *root); 
     29 
     30void AW_insert_common_property_menu_entries(AW_window_menu_modes *awmm); 
     31void AW_insert_common_property_menu_entries(AW_window_simple_menu *awsm); 
    2932 
    3033enum AW_GCM_AREA {