Changeset 6679 for trunk

Show
Ignore:
Timestamp:
16/07/10 09:52:36 (19 months ago)
Author:
westram
Message:
  • When ~/arb_tcp.dat exists it is used by ARB, but editing in ptserver admin always edited $(ARBHOME)/lib/arb_tcp.dat. fixed
  • added arb_tcp.dat configure button in nameserver admin window
Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • trunk/PROBE_DESIGN/probe_design.cxx

    r6669 r6679  
    18081808 
    18091809static void pd_edit_arb_tcp(AW_window *aww, AW_CL cl_gb_main) { 
    1810     GBDATA *gb_main = (GBDATA*)cl_gb_main; 
    1811     AW_edit("$(ARBHOME)/lib/arb_tcp.dat", arb_tcp_dat_changed_cb, aww, gb_main); 
     1810    GBDATA *gb_main  = (GBDATA*)cl_gb_main; 
     1811    char   *filename = GBS_find_lib_file("arb_tcp.dat", "", true); 
     1812 
     1813    AW_edit(filename, arb_tcp_dat_changed_cb, aww, gb_main); 
     1814    free(filename); 
    18121815} 
    18131816 

  • trunk/SL/AW_NAME/AW_names_admin.cxx

    r6408 r6679  
    6464} 
    6565 
     66static void edit_arb_tcp(AW_window *aww, AW_CL cl_gb_main) { 
     67    GBDATA *gb_main  = (GBDATA*)cl_gb_main; 
     68    char   *filename = GBS_find_lib_file("arb_tcp.dat", "", true); 
     69 
     70    AW_edit(filename, NULL, aww, gb_main); 
     71    free(filename); 
     72} 
     73 
     74 
    6675void AW_create_namesadmin_awars(AW_root *awr, GBDATA *gb_main) { 
    6776    awr->awar_string(AWAR_NAMESERVER_ADDID, "", gb_main); 
    … …  
    103112    aws->create_input_field(AWAR_NAMESERVER_ADDID, 20); 
    104113 
     114    aws->at("config"); 
     115    aws->callback(edit_arb_tcp, cl_gb_main); 
     116    aws->create_button("CREATE_TEMPLATE", "Configure arb_tcp.dat"); 
     117 
    105118    return aws; 
    106119} 

  • trunk/lib/pictures/awtc/names_admin.fig

    r4371 r6679  
    1 #FIG 3.2 
     1#FIG 3.2  Produced by xfig version 3.2.5 
    22Landscape 
    33Center 
    … …  
    1111         180 180 
    12122 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 1 
    13          5220 3780 
    14 4 0 -1 0 0 18 12 0.0000 4 135 540 450 495 $close\001 
    15 4 2 -1 0 0 18 12 0.0000 4 165 450 4860 495 $help\001 
    16 4 1 -1 0 0 18 12 0.0000 4 135 630 2610 915 $delete\001 
    17 4 1 -1 0 0 18 12 0.0000 4 150 990 2610 1980 $remove_arb\001 
    18 4 1 -1 0 0 18 12 0.0000 4 135 450 2610 1440 $edit\001 
    19 4 1 -1 0 0 18 12 0.0000 4 165 2520 2610 2790 Additional species ID field:\001 
    20 4 1 -1 0 0 18 12 0.0000 4 150 900 2610 3240 $add_field\001 
     13         5220 4095 
     144 0 -1 0 0 18 12 0.0000 4 210 675 450 495 $close\001 
     154 2 -1 0 0 18 12 0.0000 4 225 570 4860 495 $help\001 
     164 1 -1 0 0 18 12 0.0000 4 210 750 2610 915 $delete\001 
     174 1 -1 0 0 18 12 0.0000 4 225 1350 2610 1980 $remove_arb\001 
     184 1 -1 0 0 18 12 0.0000 4 210 510 2610 1440 $edit\001 
     194 1 -1 0 0 18 12 0.0000 4 210 2775 2610 2790 Additional species ID field:\001 
     204 1 -1 0 0 18 12 0.0000 4 225 1065 2610 3240 $add_field\001 
     214 1 -1 0 0 18 12 0.0000 4 225 765 2610 3825 $config\001