From 10237e0bde004c5a6db6674d7f521b67dbfde9b9 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Thu, 10 Nov 2011 12:23:52 +0000 Subject: Amiga frontend update for r13139 svn path=/trunk/netsurf/; revision=13140 --- amiga/gui.h | 4 ---- amiga/tree.c | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 6 deletions(-) (limited to 'amiga') diff --git a/amiga/gui.h b/amiga/gui.h index 19a3c4d4d..118470221 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -58,10 +58,6 @@ enum GID_PASS, GID_LOGIN, GID_CANCEL, - GID_OPEN, - GID_NEWF, - GID_NEWB, - GID_DEL, GID_NEXT, GID_PREV, GID_SEARCHSTRING, diff --git a/amiga/tree.c b/amiga/tree.c index 57bf9e6fc..1ace82d13 100755 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -67,10 +67,19 @@ #define AMI_TREE_MENU_DELETE FULLMENUNUM(1,0,0) #define AMI_TREE_MENU_CLEAR FULLMENUNUM(1,3,0) +enum { + GID_OPEN = GID_LAST, + GID_NEWF, + GID_NEWB, + GID_DEL, + GID_DEFAULT, + GID_TREE_LAST +}; + + struct treeview_window { struct Window *win; - Object *objects[GID_LAST]; -// struct Gadget *gadgets[GID_LAST]; + Object *objects[GID_TREE_LAST]; struct nsObject *node; int type; struct NewMenu *menu; @@ -446,6 +455,7 @@ void ami_tree_menu(struct treeview_window *twin) void ami_tree_update_buttons(struct treeview_window *twin) { BOOL launch_disable = FALSE; + BOOL set_default_disable = TRUE; if(twin->type == AMI_TREE_SSLCERT) return; @@ -463,7 +473,10 @@ void ami_tree_update_buttons(struct treeview_window *twin) TAG_DONE); if((selected_node && (tree_node_is_folder(selected_node) == true))) + { launch_disable = TRUE; + set_default_disable = FALSE; + } } else { @@ -485,6 +498,14 @@ void ami_tree_update_buttons(struct treeview_window *twin) GA_Disabled, launch_disable, TAG_DONE); } + + if(twin->type == AMI_TREE_HOTLIST) + { + RefreshSetGadgetAttrs((struct Gadget *)twin->objects[GID_DEFAULT], + twin->win, NULL, + GA_Disabled, set_default_disable, + TAG_DONE); + } } void ami_tree_open(struct treeview_window *twin,int type) @@ -665,6 +686,12 @@ void ami_tree_open(struct treeview_window *twin,int type) GA_Text,messages_get("TreeDelete"), GA_RelVerify,TRUE, ButtonEnd, + LAYOUT_AddChild, twin->objects[GID_DEFAULT] = ButtonObject, + GA_ID, GID_DEFAULT, + GA_Text, messages_get("TreeDefault"), + GA_RelVerify, TRUE, + GA_Disabled, TRUE, + ButtonEnd, EndGroup, CHILD_WeightedHeight,0, EndGroup, @@ -786,6 +813,10 @@ BOOL ami_tree_event(struct treeview_window *twin) hotlist_add_entry(); break; + case GID_DEFAULT: + hotlist_set_default_folder(false); + break; + case GID_DEL: switch(twin->type) { -- cgit v1.2.3