Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/1e2cc766cdb16f1a5ef3201df5601ffbc22a8bc8
...commit
http://git.netsurf-browser.org/netsurf.git/commit/1e2cc766cdb16f1a5ef3201df5601ffbc22a8bc8
...tree
http://git.netsurf-browser.org/netsurf.git/tree/1e2cc766cdb16f1a5ef3201df5601ffbc22a8bc8
The branch, master has been updated
via 1e2cc766cdb16f1a5ef3201df5601ffbc22a8bc8 (commit)
via ffcb07b8b2a4d5096d8bd794b1b34c5ffdfd5b17 (commit)
from 31c9ffb4b51b79394f882e5efed629c2df0600d9 (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/1e2cc766cdb16f1a5ef3201df5601ffbc22a8bc8
commit 1e2cc766cdb16f1a5ef3201df5601ffbc22a8bc8
Author: Chris Young <ch...@unsatisfactorysoftware.co.uk>
Commit: Chris Young <ch...@unsatisfactorysoftware.co.uk>
Update documentation
diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide
index b39ea3d..f1536a2 100755
--- a/amiga/dist/NetSurf.guide
+++ b/amiga/dist/NetSurf.guide
@@ -182,9 +182,8 @@ links clicked within NetSurf.
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 the "Hotlist menu" 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.
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/ffcb07b8b2a4d5096d8bd794b1b34c5ffdfd5b17
commit ffcb07b8b2a4d5096d8bd794b1b34c5ffdfd5b17
Author: Chris Young <ch...@unsatisfactorysoftware.co.uk>
Commit: Chris Young <ch...@unsatisfactorysoftware.co.uk>
Make hotlist toolbar actually work
diff --git a/amiga/gui.c b/amiga/gui.c
index 7482b4b..92ad354 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1601,16 +1601,6 @@ 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;
@@ -1644,6 +1634,7 @@ void ami_handle_msg(void)
ami_gui_history(gwin,
false);
break;
+ case GID_HOTLIST:
default:
// printf("GADGET:
%ld\n",(result & WMHI_GADGETMASK));
break;
@@ -2506,6 +2497,7 @@ void ami_gui_hotlist_toolbar_add(struct gui_window_2
*gwin)
SpeedBarObject,
GA_ID, GID_HOTLIST,
GA_RelVerify, TRUE,
+ ICA_TARGET, ICTARGET_IDCMP,
SPEEDBAR_BevelStyle, BVS_NONE,
SPEEDBAR_Buttons,
&gwin->hotlist_toolbar_list,
SpeedBarEnd;
@@ -4283,6 +4275,8 @@ void ami_scroller_hook(struct Hook *hook,Object
*object,struct IntuiMessage *msg
struct gui_window_2 *gwin = hook->h_Data;
struct IntuiWheelData *wheel;
Object *reqrefresh = NULL;
+ struct Node *node = NULL;
+ char *url;
switch(msg->Class)
{
@@ -4299,6 +4293,13 @@ void ami_scroller_hook(struct Hook *hook,Object
*object,struct IntuiMessage *msg
gwin->redraw_required = true;
break;
+
+ case GID_HOTLIST:
+ if(node =
GetTagData(SPEEDBAR_SelectedNode, 0, msg->IAddress)) {
+ GetSpeedButtonNodeAttrs(node,
SBNA_UserData, (ULONG *)&url, TAG_DONE);
+ browser_window_go(gwin->bw,
url, NULL, true);
+ }
+ break;
}
break;
-----------------------------------------------------------------------
Summary of changes:
amiga/dist/NetSurf.guide | 3 +--
amiga/gui.c | 21 +++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide
index b39ea3d..f1536a2 100755
--- a/amiga/dist/NetSurf.guide
+++ b/amiga/dist/NetSurf.guide
@@ -182,9 +182,8 @@ links clicked within NetSurf.
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 the "Hotlist menu" 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.
diff --git a/amiga/gui.c b/amiga/gui.c
index 7482b4b..92ad354 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1601,16 +1601,6 @@ 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;
@@ -1644,6 +1634,7 @@ void ami_handle_msg(void)
ami_gui_history(gwin,
false);
break;
+ case GID_HOTLIST:
default:
// printf("GADGET:
%ld\n",(result & WMHI_GADGETMASK));
break;
@@ -2506,6 +2497,7 @@ void ami_gui_hotlist_toolbar_add(struct gui_window_2
*gwin)
SpeedBarObject,
GA_ID, GID_HOTLIST,
GA_RelVerify, TRUE,
+ ICA_TARGET, ICTARGET_IDCMP,
SPEEDBAR_BevelStyle, BVS_NONE,
SPEEDBAR_Buttons,
&gwin->hotlist_toolbar_list,
SpeedBarEnd;
@@ -4283,6 +4275,8 @@ void ami_scroller_hook(struct Hook *hook,Object
*object,struct IntuiMessage *msg
struct gui_window_2 *gwin = hook->h_Data;
struct IntuiWheelData *wheel;
Object *reqrefresh = NULL;
+ struct Node *node = NULL;
+ char *url;
switch(msg->Class)
{
@@ -4299,6 +4293,13 @@ void ami_scroller_hook(struct Hook *hook,Object
*object,struct IntuiMessage *msg
gwin->redraw_required = true;
break;
+
+ case GID_HOTLIST:
+ if(node =
GetTagData(SPEEDBAR_SelectedNode, 0, msg->IAddress)) {
+ GetSpeedButtonNodeAttrs(node,
SBNA_UserData, (ULONG *)&url, TAG_DONE);
+ browser_window_go(gwin->bw,
url, NULL, true);
+ }
+ break;
}
break;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
netsurf-commits@netsurf-browser.org
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
