From 6fb873c54c399dc51a6716f6671b67c91b819e86 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Fri, 4 Mar 2011 23:19:24 +0000 Subject: Add "use blank page" button for homepage url Add close gadget to window (operates as cancel) svn path=/trunk/netsurf/; revision=11909 --- amiga/gui_options.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'amiga/gui_options.c') diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 19b95d312..3f19330fa 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -1,5 +1,5 @@ /* - * Copyright 2009, 2010 Chris Young + * Copyright 2009 - 2011 Chris Young * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -72,6 +72,7 @@ enum GID_OPTS_HOMEPAGE, GID_OPTS_HOMEPAGE_DEFAULT, GID_OPTS_HOMEPAGE_CURRENT, + GID_OPTS_HOMEPAGE_BLANK, GID_OPTS_HIDEADS, GID_OPTS_CONTENTLANG, GID_OPTS_FROMLOCALE, @@ -241,6 +242,7 @@ void ami_gui_opts_setup(void) gadlab[GID_OPTS_HOMEPAGE] = (char *)ami_utf8_easy((char *)messages_get("HomePageURL")); gadlab[GID_OPTS_HOMEPAGE_DEFAULT] = (char *)ami_utf8_easy((char *)messages_get("HomePageDefault")); gadlab[GID_OPTS_HOMEPAGE_CURRENT] = (char *)ami_utf8_easy((char *)messages_get("HomePageCurrent")); + gadlab[GID_OPTS_HOMEPAGE_BLANK] = (char *)ami_utf8_easy((char *)messages_get("HomePageBlank")); gadlab[GID_OPTS_HIDEADS] = (char *)ami_utf8_easy((char *)messages_get("BlockAds")); gadlab[GID_OPTS_FROMLOCALE] = (char *)ami_utf8_easy((char *)messages_get("LocaleLang")); gadlab[GID_OPTS_HISTORY] = (char *)ami_utf8_easy((char *)messages_get("HistoryAge")); @@ -479,14 +481,14 @@ void ami_gui_opts_open(void) WA_Activate, TRUE, WA_DepthGadget, TRUE, WA_DragBar, TRUE, - WA_CloseGadget, FALSE, + WA_CloseGadget, TRUE, WA_SizeGadget, FALSE, WA_CustomScreen,scrn, WINDOW_SharedPort,sport, WINDOW_UserData,gow, WINDOW_IconifyGadget, FALSE, WINDOW_Position, WPOS_CENTERSCREEN, - WA_IDCMP,IDCMP_GADGETUP, + WA_IDCMP, IDCMP_GADGETUP | IDCMP_CLOSEWINDOW, WINDOW_ParentGroup, gow->objects[GID_OPTS_MAIN] = VGroupObject, LAYOUT_AddChild, ClickTabObject, GA_RelVerify, TRUE, @@ -521,6 +523,11 @@ void ami_gui_opts_open(void) GA_Text,gadlab[GID_OPTS_HOMEPAGE_CURRENT], GA_RelVerify,TRUE, ButtonEnd, + LAYOUT_AddChild, gow->objects[GID_OPTS_HOMEPAGE_BLANK] = ButtonObject, + GA_ID,GID_OPTS_HOMEPAGE_BLANK, + GA_Text,gadlab[GID_OPTS_HOMEPAGE_BLANK], + GA_RelVerify,TRUE, + ButtonEnd, LayoutEnd, LayoutEnd, //homepage CHILD_WeightedHeight, 0, @@ -1617,6 +1624,11 @@ BOOL ami_gui_opts_event(void) { switch(result & WMHI_CLASSMASK) // class { + case WMHI_CLOSEWINDOW: + ami_gui_opts_close(); + return TRUE; + break; + case WMHI_GADGETUP: switch(result & WMHI_GADGETMASK) { @@ -1648,6 +1660,12 @@ BOOL ami_gui_opts_event(void) content_get_url(curbw->current_content), TAG_DONE); break; + case GID_OPTS_HOMEPAGE_BLANK: + if(curbw) RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_HOMEPAGE], + gow->win, NULL, STRINGA_TextVal, + "about:blank", TAG_DONE); + break; + case GID_OPTS_FROMLOCALE: if(text = ami_locale_langs()) { -- cgit v1.2.3