diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2008-10-18 15:13:18 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2008-10-18 15:13:18 +0000 |
commit | 52c57acc487ed5cef6fcf8d4ed8d3368fc0ad46d (patch) | |
tree | 1b40793d23e4ff0d44fd8a00ceed77aa4b842fad | |
parent | 1139f0e907af889815cb39cab4b1f7bb770b2871 (diff) | |
download | netsurf-52c57acc487ed5cef6fcf8d4ed8d3368fc0ad46d.tar.gz netsurf-52c57acc487ed5cef6fcf8d4ed8d3368fc0ad46d.tar.bz2 |
Folders in the Hotlist menu hierarchy with no child nodes will now be disabled in the
menu. Items named "--" will be converted to NM_BARLABEL.
svn path=/trunk/netsurf/; revision=5595
-rwxr-xr-x | amiga/dist/NetSurf.guide | 53 | ||||
-rwxr-xr-x | amiga/dist/netsurf.readme | 6 | ||||
-rwxr-xr-x | amiga/menu.c | 15 |
3 files changed, 67 insertions, 7 deletions
diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide index 8f88477d0..211fdae52 100755 --- a/amiga/dist/NetSurf.guide +++ b/amiga/dist/NetSurf.guide @@ -6,9 +6,13 @@ @{b}NetSurf@{ub} Amiga-specific documentation http://www.netsurf-browser.org +@{"Licence " link COPYING/Main} @{"Command line options" link cli} @{"Options file " link options} @{"ARexx port " link arexx} +@{"Hotlist menu " link hotlist} + +@{"Credits " link contact} @endnode @node cli "Command line options" @@ -47,3 +51,52 @@ Commands are: @{b}OPEN URL/A@{ub} Opens URL in a new window @{b}QUIT@{ub} Quits NetSurf @endnode + +@node hotlist "Hotlist menu" +Items from the hotlist can be added to the Hotlist menu as follows: + +Select Hotlist => Show hotlist... +Add a folder called Menu. This must not be placed within any other folder. + +Items in this folder node up to a maximum (currently) of 40 items will be added to the Hotlist menu, within the limits of the Intuition menu system. + +Items in folders within the Menu folder node will be converted to subitems in the menu. + +Folders more than one level down in the heirarchy will become menu items with no action. Items deeper will not be included in the menu at all. + +Folders with no items in them will show up disabled in the menu. If they are named "--" they will be displayed as separator bars. + +eg. + +- Menu + | + +- Netsurf + | | + | +- NetSurf Homepage + | | + | +- More NetSurf links + | | + | +- NetSurf bugtracker + | + +- -- + | + +- Google + +Will look something like the following within the menu: + +|NetSurf »| - |NetSurf Homepage | +|---------| |More NetSurf links| +|Google | + +@endnode + +@node contact "Credits" +NetSurf was ported to AmigaOS 4 by Chris Young +chris@unsatisfactorysoftware.co.uk + +The pointer images and AISS theme Throbber were drawn by Martin 'Mason' Merz. +http://www.masonicons.de + +All other code and files are the same for all platforms and credited in the files and/or on the NetSurf website. +http://www.netsurf-browser.org +@endnode diff --git a/amiga/dist/netsurf.readme b/amiga/dist/netsurf.readme index d7872b432..572881861 100755 --- a/amiga/dist/netsurf.readme +++ b/amiga/dist/netsurf.readme @@ -2,13 +2,11 @@ Short: Fast CSS capable web browser Uploader: chris@unsatisfactorysoftware.co.uk (Chris Young) Author: NetSurf contributors (OS4 port by Chris Young) Type: comm/www -Version: 2.0 development (SVN 5484) +Version: 2.0 development (SVN 5591) Architecture: ppc-amigaos >= 4.0.0 Requires: AISS -NOT FOR DISTRIBUTION!!!! - -This is a PREVIEW RELEASE of the OS4 native port of NetSurf. +This is a preview release of the OS4 native port of NetSurf. It is beta software, which means it is unstable and missing features - use at your own risk! diff --git a/amiga/menu.c b/amiga/menu.c index 8d87e77b0..055bf7652 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -222,12 +222,21 @@ void ami_menu_scan_2(struct tree *tree,struct node *root,WORD *gen,ULONG *item,s if(*gen == 2) menu[*item].nm_Type = NM_ITEM; if(*gen == 3) menu[*item].nm_Type = NM_SUB; - menulab[*item] = ami_utf8_easy(element->text); + if(strcmp(element->text,"--")) + { + menulab[*item] = ami_utf8_easy(element->text); + } + else + { + menulab[*item] = NM_BARLABEL; + } + menu[*item].nm_Label = menulab[*item]; element = tree_find_element(node, TREE_ELEMENT_URL); - if(element && element->text) - menu[*item].nm_UserData = element->text; + if(element && element->text) menu[*item].nm_UserData = element->text; + + if(node->folder && (!node->child)) menu[*item].nm_Flags = NM_ITEMDISABLED; *item = *item + 1; } |