From 3fb6622a92e4475cc72cee5c5140e015dbbfd97a Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 21 Jun 2009 15:05:25 +0000 Subject: Added mouse pointer options to the Display tab, as they are probably better suited here than in Advanced where I was going to put them. Also, like all the other options on this tab, they will not take effect until NetSurf is restarted. I have now added a note (or, more accurately, a placeholder for what will be a proper note once I've added all the new strings to the Messages files) to this effect underneath the options on the Display tab. svn path=/trunk/netsurf/; revision=7907 --- amiga/gui_options.c | 32 ++++++++++++++++++++++++++++++++ amiga/gui_options.h | 2 ++ 2 files changed, 34 insertions(+) (limited to 'amiga') diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 4b1370b4e..ad3ffbf05 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -81,6 +81,8 @@ void ami_gui_opts_setup(void) gadlab[GID_OPTS_REFERRAL] = (char *)ami_utf8_easy((char *)messages_get("SendReferer")); gadlab[GID_OPTS_FASTSCROLL] = (char *)ami_utf8_easy((char *)messages_get("FastScrolling")); gadlab[GID_OPTS_SCREEN] = (char *)ami_utf8_easy((char *)messages_get("Screen")); + gadlab[GID_OPTS_PTRTRUE] = (char *)ami_utf8_easy((char *)messages_get("TrueColourPtrs")); + gadlab[GID_OPTS_PTROS] = (char *)ami_utf8_easy((char *)messages_get("OSPointers")); gadlab[GID_OPTS_SAVE] = (char *)ami_utf8_easy((char *)messages_get("Save")); gadlab[GID_OPTS_USE] = (char *)ami_utf8_easy((char *)messages_get("Use")); gadlab[GID_OPTS_CANCEL] = (char *)ami_utf8_easy((char *)messages_get("Cancel")); @@ -261,6 +263,7 @@ void ami_gui_opts_open(void) CHILD_WeightedHeight,0, LayoutEnd, LayoutEnd, // screen + CHILD_WeightedHeight,0, LAYOUT_AddChild,VGroupObject, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, @@ -274,6 +277,27 @@ void ami_gui_opts_open(void) GetFileEnd, LayoutEnd, // theme CHILD_WeightedHeight, 0, + LAYOUT_AddChild,VGroupObject, + LAYOUT_SpaceOuter, TRUE, + LAYOUT_BevelStyle, BVS_GROUP, + LAYOUT_Label, messages_get("MousePointers"), + LAYOUT_AddChild, gow->gadgets[GID_OPTS_PTRTRUE] = CheckBoxObject, + GA_ID, GID_OPTS_PTRTRUE, + GA_RelVerify, TRUE, + GA_Text, gadlab[GID_OPTS_PTRTRUE], + GA_Selected, option_truecolour_mouse_pointers, + CheckBoxEnd, + LAYOUT_AddChild, gow->gadgets[GID_OPTS_PTROS] = CheckBoxObject, + GA_ID, GID_OPTS_PTROS, + GA_RelVerify, TRUE, + GA_Text, gadlab[GID_OPTS_PTROS], + GA_Selected, option_use_os_pointers, + CheckBoxEnd, + LayoutEnd, // mouse + CHILD_WeightedHeight,0, + LAYOUT_AddImage, LabelObject, + LABEL_Text, messages_get("will not take effect until next time netsurf is launched"), + LabelEnd, LayoutEnd, // page vgroup PageEnd, // pageadd /* @@ -398,6 +422,14 @@ void ami_gui_opts_use(void) GetAttr(GETFILE_Drawer,gow->gadgets[GID_OPTS_THEME],(ULONG *)&data); if(option_theme) free(option_theme); option_theme = (char *)strdup((char *)data); + + GetAttr(GA_Selected,gow->gadgets[GID_OPTS_PTRTRUE],(ULONG *)&data); + if(data) option_truecolour_mouse_pointers = true; + else option_truecolour_mouse_pointers = false; + + GetAttr(GA_Selected,gow->gadgets[GID_OPTS_PTROS],(ULONG *)&data); + if(data) option_use_os_pointers = true; + else option_use_os_pointers = false; } void ami_gui_opts_close(void) diff --git a/amiga/gui_options.h b/amiga/gui_options.h index b7dc709b4..ec93fe9a2 100755 --- a/amiga/gui_options.h +++ b/amiga/gui_options.h @@ -38,6 +38,8 @@ enum GID_OPTS_SCREENMODE, GID_OPTS_SCREENNAME, GID_OPTS_THEME, + GID_OPTS_PTRTRUE, + GID_OPTS_PTROS, GID_OPTS_SAVE, GID_OPTS_USE, GID_OPTS_CANCEL, -- cgit v1.2.3