d9ed8e1065858b02349060ebbb8fc4c99ed010ee braney Sat Nov 28 11:41:43 2020 -0800 finalizing font work (dropping some fonts and fiddling with the visibility of the style menu. diff --git src/hg/hgTracks/config.c src/hg/hgTracks/config.c index dbb1942..402fb39 100644 --- src/hg/hgTracks/config.c +++ src/hg/hgTracks/config.c @@ -48,94 +48,70 @@ labels[i] = name; i++; } char* currentTheme = cartOptionalString(cart, "theme"); hDropList("theme", labels, i, currentTheme); slFreeList(themes); hPrintf(""); } char *freeTypeFontNames[] = { "AvantGarde-Book", "AvantGarde-Demi", "AvantGarde-BookOblique", "AvantGarde-DemiOblique", -"Bookman-Light", -"Bookman-Demi", -"Bookman-LightItalic", -"Bookman-DemiItalic", -"NewCenturySchlbk-Roman", -"NewCenturySchlbk-Bold", -"NewCenturySchlbk-Italic", -"NewCenturySchlbk-BoldItalic", "Helvetica", "Helvetica-Bold", "Helvetica-Oblique", "Helvetica-BoldOblique", "Helvetica-Narrow", "Helvetica-Narrow-Bold", "Helvetica-Narrow-Oblique", "Helvetica-Narrow-BoldOblique", "Times-Roman", "Times-Bold", "Times-Italic", "Times-BoldItalic", "Courier", "Courier-Bold", "Courier-Oblique", "Courier-BoldOblique", -"Palatino-Roman", -"Palatino-Bold", -"Palatino-Italic", -"Palatino-BoldItalic", "ZapfChancery-MediumItalic", }; char *freeTypeFontFiles[] = { "a010013l.pfb", "a010015l.pfb", "a010033l.pfb", "a010035l.pfb", -"b018012l.pfb", -"b018015l.pfb", -"b018032l.pfb", -"b018035l.pfb", -"c059013l.pfb", -"c059016l.pfb", -"c059033l.pfb", -"c059036l.pfb", "n019003l.pfb", "n019004l.pfb", "n019023l.pfb", "n019024l.pfb", "n019043l.pfb", "n019044l.pfb", "n019063l.pfb", "n019064l.pfb", "n021003l.pfb", "n021004l.pfb", "n021023l.pfb", "n021024l.pfb", "n022003l.pfb", "n022004l.pfb", "n022023l.pfb", "n022024l.pfb", -"p052003l.pfb", -"p052004l.pfb", -"p052023l.pfb", -"p052024l.pfb", "z003034l.pfb", }; char *emptyStyles[] = { "Normal" }; static void textFontDropDown() /* Create drop down for font size. */ { /* get current values for font and style */ char *currentFontName = cloneString(tl.textFont); char *currentStyle = strchr(currentFontName, '-'); if (currentStyle) *currentStyle++ = 0; @@ -176,32 +152,35 @@ if (style == NULL) style = cloneString("Normal"); if (numStyle) dyStringPrintf(dy, ","); dyStringPrintf(dy, "'%s'", style); numStyle++; lastName = fontName; } dyStringPrintf(dy, " ];\n"); dyStringPrintf(dy, " $(\"[name='%s']\").change(function()\n", textFontVar); dyStringPrintf(dy, " {\n"); dyStringPrintf(dy, "$(\"[name='textStyle']\").empty();"); dyStringPrintf(dy, " val= $(this).find(':selected').val(); \n"); +dyStringPrintf(dy, " if (fontStyles[val].length == 1) {$(\"[id='textStyleDrop']\").hide();$(\"[id='textStyleName']\").hide();}\n"); +dyStringPrintf(dy, "else\n"); +dyStringPrintf(dy, " {$(\"[id='textStyleDrop']\").show();$(\"[id='textStyleName']\").show();\n"); dyStringPrintf(dy, " for(ii=0; ii < fontStyles[val].length; ii++) { $(\"[name='textStyle']\").append( new Option(fontStyles[val][ii],fontStyles[val][ii],))};\n"); -dyStringPrintf(dy, " });\n"); +dyStringPrintf(dy, " }});\n"); dyStringPrintf(dy, "$(\"[name='textFont']\").change();\n"); dyStringPrintf(dy, "$(\"[name='textStyle']\").val('%s');\n", currentStyle); jsInline(dy->string); hDropList(textFontVar, faceNames, numFonts, currentFontName); } static void textStyleDropDown() /* Create drop down for font size. */ { hDropList(textStyleVar, emptyStyles, ArraySize(emptyStyles), emptyStyles[0]); } static void textSizeDropDown() /* Create drop down for font size. */ @@ -593,32 +572,32 @@ cartMakeRadioButton(cart, "fontType", "fixed", defaultStyle); hPrintf(" fixed "); cartMakeRadioButton(cart, "fontType", "bold", defaultStyle); hPrintf(" bold "); hPrintf(" "); hPrintf(""); } hPrintf(""); if (sameString(cfgOptionDefault("freeType", "off"), "on")) { hPrintf("font:"); hPrintf(""); textFontDropDown(); hPrintf(""); - hPrintf("style:"); - hPrintf(""); + hPrintf("style:"); + hPrintf(""); textStyleDropDown(); hPrintf(""); hPrintf(""); } themeDropDown(cart); hTableStart(); if (ideoTrack != NULL) { hPrintf(""); hCheckBox("ideogram", cartUsualBoolean(cart, "ideogram", TRUE)); hPrintf(""); hPrintf("Display chromosome ideogram above main graphic"); hPrintf("\n");