diff options
Diffstat (limited to 'frontends/amiga/gui_options.c')
| -rwxr-xr-x | frontends/amiga/gui_options.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c index 78dea5820..fb214d0fb 100755 --- a/frontends/amiga/gui_options.c +++ b/frontends/amiga/gui_options.c @@ -270,9 +270,8 @@ static void ami_gui_opts_array_to_list(struct List *list, const char *array[], i node = AllocChooserNode(CNA_Text, array[i], TAG_DONE); break; case NSA_LIST_RADIO: - /* Note: RBNA_Labels is RBNA_Label in OS4 - * Also note: These labels don't work (FIXME) */ - node = AllocRadioButtonNode(RBNA_Labels, array[i], TAG_DONE); + /* Note: RBNA_Labels is RBNA_Label in OS4 */ + node = AllocRadioButtonNode(0, RBNA_Labels, array[i], TAG_DONE); break; default: break; @@ -1107,8 +1106,8 @@ void ami_gui_opts_open(void) GA_ID, GID_OPTS_DPI_Y, GA_RelVerify, TRUE, INTEGER_Number, nsoption_int(screen_ydpi), - INTEGER_Minimum, 60, - INTEGER_Maximum, 150, + INTEGER_Minimum, 20, + INTEGER_Maximum, 200, INTEGER_Arrows, TRUE, GA_Disabled, nsoption_bool(bitmap_fonts), IntegerEnd, @@ -1748,7 +1747,7 @@ static void ami_gui_opts_use(bool save) switch(data) { case 0: - nsoption_set_charp(pubscreen_name, strdup("\0")); + nsoption_set_charp(pubscreen_name, NULL); break; case 1: @@ -1898,6 +1897,15 @@ static void ami_gui_opts_use(bool save) #ifndef __amigaos4__ GetAttr(GA_Selected, gow->objects[GID_OPTS_FONT_BITMAP], (ULONG *)&data); ami_font_fini(); + + if((nsoption_bool(bitmap_fonts) == true) && (data == false)) { + nsoption_set_charp(font_sans, (char *)strdup("CGTriumvirate")); + nsoption_set_charp(font_serif, (char *)strdup("CGTimes")); + nsoption_set_charp(font_mono, (char *)strdup("LetterGothic")); + nsoption_set_charp(font_cursive, (char *)strdup("CGTriumvirate")); + nsoption_set_charp(font_fantasy, (char *)strdup("CGTimes")); + } + if(data) { nsoption_set_bool(bitmap_fonts, true); } else { @@ -2134,7 +2142,7 @@ static BOOL ami_gui_opts_event(void *w) case GID_OPTS_HOMEPAGE_CURRENT: if(cur_gw) RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_HOMEPAGE], gow->win, NULL, STRINGA_TextVal, - nsurl_access(browser_window_get_url(cur_gw->bw)), TAG_DONE); + nsurl_access(browser_window_access_url(cur_gw->bw)), TAG_DONE); break; case GID_OPTS_HOMEPAGE_BLANK: |