Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/61872ab3a493d60ede0e5... ...commit http://git.netsurf-browser.org/netsurf.git/commit/61872ab3a493d60ede0e5ca... ...tree http://git.netsurf-browser.org/netsurf.git/tree/61872ab3a493d60ede0e5ca22... The branch, master has been updated via 61872ab3a493d60ede0e5ca2221b4c5c94708171 (commit) via 23dc635e1a2386d52779384d6117f020376142f7 (commit) via d66e9c34a8e5e6081541c2b7bfd1e97012289494 (commit) from ec79063155c809d52e54812e0045900bbad53532 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/61872ab3a493d60ede0... commit 61872ab3a493d60ede0e5ca2221b4c5c94708171 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Debug diff --git a/amiga/gui.c b/amiga/gui.c index 93ee082..7482b4b 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1206,6 +1206,7 @@ void ami_handle_msg(void) struct browser_window *closedbw; struct timeval curtime; static int drag_x_move = 0, drag_y_move = 0; + char *url; if(IsMinListEmpty(window_list)) { @@ -1601,11 +1602,13 @@ void ami_handle_msg(void) break; case GID_HOTLIST: - GetAttrs(gwin->objects[GID_HOTLIST], - SPEEDBAR_SelectedNode, &tabnode, TAG_DONE); - GetSpeedButtonNodeAttrs(tabnode, SBNA_UserData, (ULONG *)&storage, TAG_DONE); - - browser_window_go(gwin->bw, (char *)storage, NULL, true); + GetAttr(SPEEDBAR_SelectedNode, + (Object *)gwin->objects[GID_HOTLIST], + (ULONG *)&tabnode); + printf("%lx %d\n", tabnode, code); + GetSpeedButtonNodeAttrs(tabnode, SBNA_UserData, (ULONG *)&url, TAG_DONE); + printf("%s\n", url); + browser_window_go(gwin->bw, url, NULL, true); break; case GID_HOME: commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/23dc635e1a2386d5277... commit 23dc635e1a2386d52779384d6117f020376142f7 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Make hotlist toolbar work and update (only updates on hotlist window close currently) diff --git a/amiga/gui.c b/amiga/gui.c index 2cbceac..93ee082 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1600,6 +1600,14 @@ void ami_handle_msg(void) browser_window_go(gwin->bw,(char *)storage, NULL, true); break; + case GID_HOTLIST: + GetAttrs(gwin->objects[GID_HOTLIST], + SPEEDBAR_SelectedNode, &tabnode, TAG_DONE); + GetSpeedButtonNodeAttrs(tabnode, SBNA_UserData, (ULONG *)&storage, TAG_DONE); + + browser_window_go(gwin->bw, (char *)storage, NULL, true); + break; + case GID_HOME: browser_window_go(gwin->bw,nsoption_charp(homepage_url),NULL,true); break; @@ -2477,7 +2485,7 @@ int ami_gui_hotlist_scan(struct tree *tree, struct List *speed_button_list, stru { element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); if(!element) element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); - if(element && (strcmp(tree_node_element_get_text(element), "Toolbar") == 0)) + if(element && (strcmp(tree_node_element_get_text(element), messages_get("HotlistToolbar")) == 0)) { ami_gui_hotlist_scan_2(tree, tree_node_get_child(node), &gen, &item, speed_button_list, gwin); } @@ -2509,12 +2517,100 @@ void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_ADDIMAGE, gwin->win, gwin->objects[GID_HOTLISTSEPBAR], NULL); + + FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]); + + RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN], + gwin->win, NULL, TRUE); + } +} + +void ami_gui_hotlist_toolbar_free(struct gui_window_2 *gwin, struct List *speed_button_list) +{ + int i; + struct Node *node; + struct Node *nnode; + + if(IsListEmpty(speed_button_list)) return; + node = GetHead(speed_button_list); + + do { + nnode = GetSucc(node); + Remove(node); + FreeSpeedButtonNode(node); + } while(node = nnode); + + for(i = 0; i < AMI_GUI_TOOLBAR_MAX; i++) { + if(gwin->hotlist_toolbar_lab[i]) { + free(gwin->hotlist_toolbar_lab[i]); + gwin->hotlist_toolbar_lab[i] = NULL; + } } +} + +void ami_gui_hotlist_toolbar_remove(struct gui_window_2 *gwin) +{ + IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_REMOVECHILD, + gwin->win, gwin->objects[GID_HOTLIST]); + + IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_REMOVECHILD, + gwin->win, gwin->objects[GID_HOTLISTSEPBAR]); FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]); RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN], gwin->win, NULL, TRUE); + + gwin->redraw_required = true; + gwin->bw->reformat_pending = true; + + ami_gui_hotlist_toolbar_free(gwin, &gwin->hotlist_toolbar_list); +} + +void ami_gui_hotlist_toolbar_update(struct gui_window_2 *gwin) +{ + if(IsListEmpty(&gwin->hotlist_toolbar_list)) { + ami_gui_hotlist_toolbar_add(gwin); + return; + } + + /* Below should be SetAttr according to Autodocs */ + SetGadgetAttrs((struct Gadget *)gwin->objects[GID_HOTLIST], + gwin->win, NULL, + SPEEDBAR_Buttons, ~0, + TAG_DONE); + + ami_gui_hotlist_toolbar_free(gwin, &gwin->hotlist_toolbar_list); + + if(ami_gui_hotlist_scan(ami_tree_get_tree(hotlist_window), &gwin->hotlist_toolbar_list, gwin) > 0) { + SetGadgetAttrs((struct Gadget *)gwin->objects[GID_HOTLIST], + gwin->win, NULL, + SPEEDBAR_Buttons, &gwin->hotlist_toolbar_list, + TAG_DONE); + } else { + ami_gui_hotlist_toolbar_remove(gwin); + } +} + +void ami_gui_hotlist_toolbar_update_all(void) +{ + struct nsObject *node; + struct nsObject *nnode; + struct gui_window_2 *gwin; + + if(IsMinListEmpty(window_list)) return; + + node = (struct nsObject *)GetHead((struct List *)window_list); + + do { + nnode=(struct nsObject *)GetSucc((struct Node *)node); + gwin = node->objstruct; + + if(node->Type == AMINS_WINDOW) + { + ami_gui_hotlist_toolbar_update(gwin); + } + } while(node = nnode); } void ami_toggletabbar(struct gui_window_2 *gwin, bool show) @@ -3305,6 +3401,8 @@ void gui_window_destroy(struct gui_window *g) ami_gui_appicon_remove(g->shared); if(g->shared->appwin) RemoveAppWindow(g->shared->appwin); + ami_gui_hotlist_toolbar_free(g->shared, &g->shared->hotlist_toolbar_list); + /* These aren't freed by the above. * TODO: nav_west etc need freeing too? */ DisposeObject(g->shared->objects[GID_ADDTAB_BM]); diff --git a/amiga/gui.h b/amiga/gui.h index 14cec10..6a5434f 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -153,6 +153,7 @@ int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie); bool ami_text_box_at_point(struct gui_window_2 *gwin, ULONG *x, ULONG *y); BOOL ami_gadget_hit(Object *obj, int x, int y); void ami_gui_history(struct gui_window_2 *gwin, bool back); +void ami_gui_hotlist_toolbar_update_all(void); struct TextFont *origrpfont; struct MinList *window_list; diff --git a/amiga/menu.c b/amiga/menu.c index b116e1b..f428606 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -506,17 +506,17 @@ ULONG ami_menu_scan(struct tree *tree, bool count, struct gui_window_2 *gwin) { element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); if(!element) element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); - if(element && (strcmp(tree_node_element_get_text(element),"Menu")==0)) + if(element && (strcmp(tree_node_element_get_text(element), messages_get("HotlistMenu")) == 0)) { // found menu - ami_menu_scan_2(tree,tree_node_get_child(node),&gen,&item,count,gwin); + ami_menu_scan_2(tree, tree_node_get_child(node), &gen, &item, count, gwin); } } return(item - AMI_MENU_HOTLIST); } -void ami_menu_scan_2(struct tree *tree,struct node *root,WORD *gen, +void ami_menu_scan_2(struct tree *tree, struct node *root, WORD *gen, ULONG *item, bool count, struct gui_window_2 *gwin) { struct node *tempnode; diff --git a/amiga/tree.c b/amiga/tree.c index f2ef3cc..95a68dc 100755 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -690,6 +690,8 @@ void ami_tree_close(struct treeview_window *twin) ami_utf8_free(twin->sslreject); ami_ssl_free(twin); } + + ami_gui_hotlist_toolbar_update_all(); } void ami_tree_update_quals(struct treeview_window *twin) commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/d66e9c34a8e5e608154... commit d66e9c34a8e5e6081541c2b7bfd1e97012289494 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Create "menu" and "toolbar" directories in the hotlist if they don't exist on startup diff --git a/amiga/hotlist.c b/amiga/hotlist.c index 6469cbd..b67e10f 100755 --- a/amiga/hotlist.c +++ b/amiga/hotlist.c @@ -18,8 +18,41 @@ #include <proto/exec.h> #include "amiga/hotlist.h" -#include "desktop/hotlist.h" #include "amiga/tree.h" +#include "desktop/hotlist.h" +#include "utils/messages.h" + +bool ami_hotlist_find_dir(struct tree *tree, const char *dir_name) +{ + struct node *root = tree_node_get_child(tree_get_root(tree)); + struct node *node; + struct node_element *element; + + for (node = root; node; node = tree_node_get_next(node)) + { + element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); + if(!element) element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); + if(element && (strcmp(tree_node_element_get_text(element), dir_name) == 0)) + { + return true; + } + } + + return false; +} + +void ami_hotlist_add_default_dirs(struct tree *tree) +{ + if(ami_hotlist_find_dir(tree, messages_get("HotlistMenu")) == false) { + tree_create_folder_node(tree, tree_get_root(tree), + messages_get("HotlistMenu"), true, false, false); + } + + if(ami_hotlist_find_dir(tree, messages_get("HotlistToolbar")) == false) { + tree_create_folder_node(tree, tree_get_root(tree), + messages_get("HotlistToolbar"), true, false, false); + } +} void ami_hotlist_initialise(const char *hotlist_file) { @@ -30,6 +63,8 @@ void ami_hotlist_initialise(const char *hotlist_file) hotlist_initialise(ami_tree_get_tree(hotlist_window), hotlist_file, tree_directory_icon_name); + + ami_hotlist_add_default_dirs(ami_tree_get_tree(hotlist_window)); } void ami_hotlist_free(const char *hotlist_file) diff --git a/resources/FatMessages b/resources/FatMessages index 45b3086..e8f22aa 100644 --- a/resources/FatMessages +++ b/resources/FatMessages @@ -1207,6 +1207,19 @@ fr.all.HotlistFeatureRequest:Demandes de nouvelles fonctions de Netsurf it.all.HotlistFeatureRequest:Suggerimenti per NetSurf nl.all.HotlistFeatureRequest:NetSurf feature requests +# Default (Amiga) hotlist folder names +# +en.ami.HotlistMenu:Hotlist menu +de.ami.HotlistMenu:Hotlist menu +fr.ami.HotlistMenu:Hotlist menu +it.ami.HotlistMenu:Hotlist menu +nl.ami.HotlistMenu:Hotlist menu +en.ami.HotlistToolbar:Hotlist toolbar +de.ami.HotlistToolbar:Hotlist toolbar +fr.ami.HotlistToolbar:Hotlist toolbar +it.ami.HotlistToolbar:Hotlist toolbar +nl.ami.HotlistToolbar:Hotlist toolbar + # Global history user interface tokens # ==================================== ----------------------------------------------------------------------- Summary of changes: amiga/gui.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++- amiga/gui.h | 1 + amiga/hotlist.c | 37 +++++++++++++++++- amiga/menu.c | 6 +- amiga/tree.c | 2 + resources/FatMessages | 13 ++++++ 6 files changed, 157 insertions(+), 5 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index 2cbceac..7482b4b 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1206,6 +1206,7 @@ void ami_handle_msg(void) struct browser_window *closedbw; struct timeval curtime; static int drag_x_move = 0, drag_y_move = 0; + char *url; if(IsMinListEmpty(window_list)) { @@ -1600,6 +1601,16 @@ void ami_handle_msg(void) browser_window_go(gwin->bw,(char *)storage, NULL, true); break; + case GID_HOTLIST: + GetAttr(SPEEDBAR_SelectedNode, + (Object *)gwin->objects[GID_HOTLIST], + (ULONG *)&tabnode); + printf("%lx %d\n", tabnode, code); + GetSpeedButtonNodeAttrs(tabnode, SBNA_UserData, (ULONG *)&url, TAG_DONE); + printf("%s\n", url); + browser_window_go(gwin->bw, url, NULL, true); + break; + case GID_HOME: browser_window_go(gwin->bw,nsoption_charp(homepage_url),NULL,true); break; @@ -2477,7 +2488,7 @@ int ami_gui_hotlist_scan(struct tree *tree, struct List *speed_button_list, stru { element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); if(!element) element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); - if(element && (strcmp(tree_node_element_get_text(element), "Toolbar") == 0)) + if(element && (strcmp(tree_node_element_get_text(element), messages_get("HotlistToolbar")) == 0)) { ami_gui_hotlist_scan_2(tree, tree_node_get_child(node), &gen, &item, speed_button_list, gwin); } @@ -2509,12 +2520,100 @@ void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_ADDIMAGE, gwin->win, gwin->objects[GID_HOTLISTSEPBAR], NULL); + + FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]); + + RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN], + gwin->win, NULL, TRUE); + } +} + +void ami_gui_hotlist_toolbar_free(struct gui_window_2 *gwin, struct List *speed_button_list) +{ + int i; + struct Node *node; + struct Node *nnode; + + if(IsListEmpty(speed_button_list)) return; + node = GetHead(speed_button_list); + + do { + nnode = GetSucc(node); + Remove(node); + FreeSpeedButtonNode(node); + } while(node = nnode); + + for(i = 0; i < AMI_GUI_TOOLBAR_MAX; i++) { + if(gwin->hotlist_toolbar_lab[i]) { + free(gwin->hotlist_toolbar_lab[i]); + gwin->hotlist_toolbar_lab[i] = NULL; + } } +} + +void ami_gui_hotlist_toolbar_remove(struct gui_window_2 *gwin) +{ + IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_REMOVECHILD, + gwin->win, gwin->objects[GID_HOTLIST]); + + IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_REMOVECHILD, + gwin->win, gwin->objects[GID_HOTLISTSEPBAR]); FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]); RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN], gwin->win, NULL, TRUE); + + gwin->redraw_required = true; + gwin->bw->reformat_pending = true; + + ami_gui_hotlist_toolbar_free(gwin, &gwin->hotlist_toolbar_list); +} + +void ami_gui_hotlist_toolbar_update(struct gui_window_2 *gwin) +{ + if(IsListEmpty(&gwin->hotlist_toolbar_list)) { + ami_gui_hotlist_toolbar_add(gwin); + return; + } + + /* Below should be SetAttr according to Autodocs */ + SetGadgetAttrs((struct Gadget *)gwin->objects[GID_HOTLIST], + gwin->win, NULL, + SPEEDBAR_Buttons, ~0, + TAG_DONE); + + ami_gui_hotlist_toolbar_free(gwin, &gwin->hotlist_toolbar_list); + + if(ami_gui_hotlist_scan(ami_tree_get_tree(hotlist_window), &gwin->hotlist_toolbar_list, gwin) > 0) { + SetGadgetAttrs((struct Gadget *)gwin->objects[GID_HOTLIST], + gwin->win, NULL, + SPEEDBAR_Buttons, &gwin->hotlist_toolbar_list, + TAG_DONE); + } else { + ami_gui_hotlist_toolbar_remove(gwin); + } +} + +void ami_gui_hotlist_toolbar_update_all(void) +{ + struct nsObject *node; + struct nsObject *nnode; + struct gui_window_2 *gwin; + + if(IsMinListEmpty(window_list)) return; + + node = (struct nsObject *)GetHead((struct List *)window_list); + + do { + nnode=(struct nsObject *)GetSucc((struct Node *)node); + gwin = node->objstruct; + + if(node->Type == AMINS_WINDOW) + { + ami_gui_hotlist_toolbar_update(gwin); + } + } while(node = nnode); } void ami_toggletabbar(struct gui_window_2 *gwin, bool show) @@ -3305,6 +3404,8 @@ void gui_window_destroy(struct gui_window *g) ami_gui_appicon_remove(g->shared); if(g->shared->appwin) RemoveAppWindow(g->shared->appwin); + ami_gui_hotlist_toolbar_free(g->shared, &g->shared->hotlist_toolbar_list); + /* These aren't freed by the above. * TODO: nav_west etc need freeing too? */ DisposeObject(g->shared->objects[GID_ADDTAB_BM]); diff --git a/amiga/gui.h b/amiga/gui.h index 14cec10..6a5434f 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -153,6 +153,7 @@ int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie); bool ami_text_box_at_point(struct gui_window_2 *gwin, ULONG *x, ULONG *y); BOOL ami_gadget_hit(Object *obj, int x, int y); void ami_gui_history(struct gui_window_2 *gwin, bool back); +void ami_gui_hotlist_toolbar_update_all(void); struct TextFont *origrpfont; struct MinList *window_list; diff --git a/amiga/hotlist.c b/amiga/hotlist.c index 6469cbd..b67e10f 100755 --- a/amiga/hotlist.c +++ b/amiga/hotlist.c @@ -18,8 +18,41 @@ #include <proto/exec.h> #include "amiga/hotlist.h" -#include "desktop/hotlist.h" #include "amiga/tree.h" +#include "desktop/hotlist.h" +#include "utils/messages.h" + +bool ami_hotlist_find_dir(struct tree *tree, const char *dir_name) +{ + struct node *root = tree_node_get_child(tree_get_root(tree)); + struct node *node; + struct node_element *element; + + for (node = root; node; node = tree_node_get_next(node)) + { + element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); + if(!element) element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); + if(element && (strcmp(tree_node_element_get_text(element), dir_name) == 0)) + { + return true; + } + } + + return false; +} + +void ami_hotlist_add_default_dirs(struct tree *tree) +{ + if(ami_hotlist_find_dir(tree, messages_get("HotlistMenu")) == false) { + tree_create_folder_node(tree, tree_get_root(tree), + messages_get("HotlistMenu"), true, false, false); + } + + if(ami_hotlist_find_dir(tree, messages_get("HotlistToolbar")) == false) { + tree_create_folder_node(tree, tree_get_root(tree), + messages_get("HotlistToolbar"), true, false, false); + } +} void ami_hotlist_initialise(const char *hotlist_file) { @@ -30,6 +63,8 @@ void ami_hotlist_initialise(const char *hotlist_file) hotlist_initialise(ami_tree_get_tree(hotlist_window), hotlist_file, tree_directory_icon_name); + + ami_hotlist_add_default_dirs(ami_tree_get_tree(hotlist_window)); } void ami_hotlist_free(const char *hotlist_file) diff --git a/amiga/menu.c b/amiga/menu.c index b116e1b..f428606 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -506,17 +506,17 @@ ULONG ami_menu_scan(struct tree *tree, bool count, struct gui_window_2 *gwin) { element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); if(!element) element = tree_node_find_element(node, TREE_ELEMENT_TITLE, NULL); - if(element && (strcmp(tree_node_element_get_text(element),"Menu")==0)) + if(element && (strcmp(tree_node_element_get_text(element), messages_get("HotlistMenu")) == 0)) { // found menu - ami_menu_scan_2(tree,tree_node_get_child(node),&gen,&item,count,gwin); + ami_menu_scan_2(tree, tree_node_get_child(node), &gen, &item, count, gwin); } } return(item - AMI_MENU_HOTLIST); } -void ami_menu_scan_2(struct tree *tree,struct node *root,WORD *gen, +void ami_menu_scan_2(struct tree *tree, struct node *root, WORD *gen, ULONG *item, bool count, struct gui_window_2 *gwin) { struct node *tempnode; diff --git a/amiga/tree.c b/amiga/tree.c index f2ef3cc..95a68dc 100755 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -690,6 +690,8 @@ void ami_tree_close(struct treeview_window *twin) ami_utf8_free(twin->sslreject); ami_ssl_free(twin); } + + ami_gui_hotlist_toolbar_update_all(); } void ami_tree_update_quals(struct treeview_window *twin) diff --git a/resources/FatMessages b/resources/FatMessages index 45b3086..e8f22aa 100644 --- a/resources/FatMessages +++ b/resources/FatMessages @@ -1207,6 +1207,19 @@ fr.all.HotlistFeatureRequest:Demandes de nouvelles fonctions de Netsurf it.all.HotlistFeatureRequest:Suggerimenti per NetSurf nl.all.HotlistFeatureRequest:NetSurf feature requests +# Default (Amiga) hotlist folder names +# +en.ami.HotlistMenu:Hotlist menu +de.ami.HotlistMenu:Hotlist menu +fr.ami.HotlistMenu:Hotlist menu +it.ami.HotlistMenu:Hotlist menu +nl.ami.HotlistMenu:Hotlist menu +en.ami.HotlistToolbar:Hotlist toolbar +de.ami.HotlistToolbar:Hotlist toolbar +fr.ami.HotlistToolbar:Hotlist toolbar +it.ami.HotlistToolbar:Hotlist toolbar +nl.ami.HotlistToolbar:Hotlist toolbar + # Global history user interface tokens # ==================================== -- NetSurf Browser