db399b2936f4de34b2af6b9589fd698b2e5ddd6b
Merge parents b5d779a 6381feb
tdreszer
  Fri Jul 29 15:12:16 2011 -0700
Merge.
diff --cc src/hg/lib/hui.c
index 2241cfa,9038544..a67a151
--- src/hg/lib/hui.c
+++ src/hg/lib/hui.c
@@@ -16,31 -16,31 +16,32 @@@
  #include "chainDb.h"
  #include "netCart.h"
  #include "obscure.h"
  #include "wiggle.h"
  #include "phyloTree.h"
  #include "hgMaf.h"
  #include "udc.h"
  #include "customTrack.h"
  #include "encode/encodePeak.h"
  #include "mdb.h"
  #include "web.h"
  #include "hPrint.h"
  #include "fileUi.h"
  #include "bigBed.h"
  #include "bigWig.h"
 +#include "regexHelper.h"
+ #include "vcfUi.h"
  
  static char const rcsid[] = "$Id: hui.c,v 1.297 2010/06/02 19:27:51 tdreszer Exp $";
  
  #define SMALLBUF 128
  #define MAX_SUBGROUP 9
  #define ADD_BUTTON_LABEL        "add"
  #define CLEAR_BUTTON_LABEL      "clear"
  #define JBUFSIZE 2048
  
  //#define PM_BUTTON "<A NAME=\"%s\"></A><A HREF=\"#%s\"><IMG height=18 width=18 onclick=\"return (setCheckBoxesThatContain('%s',%s,true,'%s','','%s') == false);\" id=\"btn_%s\" src=\"../images/%s\" alt=\"%s\"></A>\n"
  //#define DEF_BUTTON "<A NAME=\"%s\"></A><A HREF=\"#%s\"><IMG onclick=\"setCheckBoxesThatContain('%s',true,false,'%s','','%s'); return (setCheckBoxesThatContain('%s',false,false,'%s','_defOff','%s') == false);\" id=\"btn_%s\" src=\"../images/%s\" alt=\"%s\"></A>\n"
  //#define DEFAULT_BUTTON(nameOrId,anc,beg,contains) printf(DEF_BUTTON,(anc),(anc),(nameOrId),        (beg),(contains),(nameOrId),(beg),(contains),(anc),"defaults_sm.png","default")
  //#define    PLUS_BUTTON(nameOrId,anc,beg,contains) printf(PM_BUTTON, (anc),(anc),(nameOrId),"true", (beg),(contains),(anc),"add_sm.gif",   "+")
  //#define   MINUS_BUTTON(nameOrId,anc,beg,contains) printf(PM_BUTTON, (anc),(anc),(nameOrId),"false",(beg),(contains),(anc),"remove_sm.gif","-")
  #define PM_BUTTON  "<IMG height=18 width=18 onclick=\"setCheckBoxesThatContain('%s',%s,true,'%s','','%s');\" id=\"btn_%s\" src=\"../images/%s\" alt=\"%s\">\n"