From c01913e93efd265716b9fd06b6fe5c807c4efaf2 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Thu, 25 Jun 2009 22:40:20 +0000 Subject: Layout of Advanced tab done, does not set values or act on gadget clicks svn path=/trunk/netsurf/; revision=7991 --- amiga/gui_options.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ amiga/gui_options.h | 7 +++++ amiga/options.h | 5 +++- 3 files changed, 88 insertions(+), 1 deletion(-) (limited to 'amiga') diff --git a/amiga/gui_options.c b/amiga/gui_options.c index cdada9e72..da3415120 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -126,6 +126,13 @@ void ami_gui_opts_setup(void) gadlab[GID_OPTS_FONT_MINSIZE] = (char *)ami_utf8_easy((char *)messages_get("FontMinSize")); gadlab[GID_OPTS_CACHE_MEM] = (char *)ami_utf8_easy((char *)messages_get("Size")); gadlab[GID_OPTS_CACHE_DISC] = (char *)ami_utf8_easy((char *)messages_get("Duration")); + gadlab[GID_OPTS_OVERWRITE] = (char *)ami_utf8_easy((char *)messages_get("ConfirmOverwrite")); + gadlab[GID_OPTS_DLDIR] = (char *)ami_utf8_easy((char *)messages_get("DownloadDir")); + gadlab[GID_OPTS_TAB_ACTIVE] = (char *)ami_utf8_easy((char *)messages_get("TabActive")); + gadlab[GID_OPTS_TAB_2] = (char *)ami_utf8_easy((char *)messages_get("TabMiddle")); + gadlab[GID_OPTS_CLIPBOARD] = (char *)ami_utf8_easy((char *)messages_get("Clipboard")); + gadlab[GID_OPTS_CMENU_ENABLE] = (char *)ami_utf8_easy((char *)messages_get("ContentEnable")); + gadlab[GID_OPTS_CMENU_STICKY] = (char *)ami_utf8_easy((char *)messages_get("ContextSticky")); 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")); @@ -746,7 +753,77 @@ void ami_gui_opts_open(void) */ PAGE_Add, LayoutObject, LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild,VGroupObject, + LAYOUT_SpaceOuter, TRUE, + LAYOUT_BevelStyle, BVS_GROUP, + LAYOUT_Label, messages_get("Downloads"), + LAYOUT_AddChild, gow->gadgets[GID_OPTS_OVERWRITE] = CheckBoxObject, + GA_ID, GID_OPTS_CLIPBOARD, + GA_RelVerify, TRUE, + GA_Disabled, TRUE, + GA_Text, gadlab[GID_OPTS_OVERWRITE], + GA_Selected, FALSE, //option_ask_overwrite, + CheckBoxEnd, + LAYOUT_AddChild, gow->gadgets[GID_OPTS_DLDIR] = GetFileObject, + GA_ID, GID_OPTS_DLDIR, + GA_RelVerify, TRUE, + GETFILE_FullFile, option_download_dir, + GETFILE_ReadOnly, TRUE, + GETFILE_FullFileExpand, FALSE, + GetFileEnd, + LayoutEnd, // downloads + CHILD_WeightedHeight, 0, + LAYOUT_AddChild,VGroupObject, + LAYOUT_SpaceOuter, TRUE, + LAYOUT_BevelStyle, BVS_GROUP, + LAYOUT_Label, messages_get("TabbedBrowsing"), + LAYOUT_AddChild, gow->gadgets[GID_OPTS_TAB_ACTIVE] = CheckBoxObject, + GA_ID, GID_OPTS_TAB_ACTIVE, + GA_RelVerify, TRUE, + GA_Text, gadlab[GID_OPTS_TAB_ACTIVE], + GA_Selected, option_new_tab_active, + CheckBoxEnd, + LAYOUT_AddChild, gow->gadgets[GID_OPTS_TAB_2] = CheckBoxObject, + GA_ID, GID_OPTS_TAB_2, + GA_RelVerify, TRUE, + GA_Text, gadlab[GID_OPTS_TAB_2], + GA_Selected, option_button_2_tab, + CheckBoxEnd, + LayoutEnd, // tabbed browsing + CHILD_WeightedHeight, 0, + LAYOUT_AddChild,HGroupObject, + LAYOUT_SpaceOuter, TRUE, + LAYOUT_BevelStyle, BVS_GROUP, + LAYOUT_Label, messages_get("Clipboard"), + LAYOUT_AddChild, gow->gadgets[GID_OPTS_CLIPBOARD] = CheckBoxObject, + GA_ID, GID_OPTS_CLIPBOARD, + GA_RelVerify, TRUE, + GA_Text, gadlab[GID_OPTS_CLIPBOARD], + GA_Selected, option_utf8_clipboard, + CheckBoxEnd, + LayoutEnd, // clipboard + CHILD_WeightedHeight, 0, + LAYOUT_AddChild,HGroupObject, + LAYOUT_SpaceOuter, TRUE, + LAYOUT_BevelStyle, BVS_GROUP, + LAYOUT_Label, messages_get("ContextMenu"), + LAYOUT_AddChild, gow->gadgets[GID_OPTS_CMENU_ENABLE] = CheckBoxObject, + GA_ID, GID_OPTS_CMENU_ENABLE, + GA_RelVerify, TRUE, + GA_Text, gadlab[GID_OPTS_CMENU_ENABLE], + GA_Selected, option_context_menu, + CheckBoxEnd, + LAYOUT_AddChild, gow->gadgets[GID_OPTS_CMENU_STICKY] = CheckBoxObject, + GA_ID, GID_OPTS_CMENU_STICKY, + GA_RelVerify, TRUE, + GA_Disabled, !option_context_menu, + GA_Text, gadlab[GID_OPTS_CMENU_STICKY], + GA_Selected, option_sticky_context_menu, + CheckBoxEnd, + LayoutEnd, // context menus + CHILD_WeightedHeight, 0, LayoutEnd, // page vgroup + CHILD_WeightedHeight, 0, PageEnd, // page object /* ** Export diff --git a/amiga/gui_options.h b/amiga/gui_options.h index 53e85f3db..b37950402 100755 --- a/amiga/gui_options.h +++ b/amiga/gui_options.h @@ -63,6 +63,13 @@ enum GID_OPTS_FONT_MINSIZE, GID_OPTS_CACHE_MEM, GID_OPTS_CACHE_DISC, + GID_OPTS_OVERWRITE, + GID_OPTS_DLDIR, + GID_OPTS_TAB_ACTIVE, + GID_OPTS_TAB_2, + GID_OPTS_CLIPBOARD, + GID_OPTS_CMENU_ENABLE, + GID_OPTS_CMENU_STICKY, GID_OPTS_SAVE, GID_OPTS_USE, GID_OPTS_CANCEL, diff --git a/amiga/options.h b/amiga/options.h index beb6f1086..76c6424f8 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -41,6 +41,7 @@ extern char *option_download_dir; extern bool option_faster_scroll; extern bool option_direct_render; extern bool option_scale_quality; +extern bool option_ask_overwrite; #define EXTRA_OPTION_DEFINE \ bool option_verbose_log = false; \ @@ -64,6 +65,7 @@ char *option_download_dir = 0; \ bool option_faster_scroll = true; \ bool option_direct_render = false; \ bool option_scale_quality = false; \ +bool option_ask_overwrite = false; \ #define EXTRA_OPTION_TABLE \ { "verbose_log", OPTION_BOOL, &option_verbose_log}, \ @@ -86,5 +88,6 @@ bool option_scale_quality = false; \ { "download_dir", OPTION_STRING, &option_download_dir }, \ { "faster_scroll", OPTION_BOOL, &option_faster_scroll}, \ { "debug_dr", OPTION_BOOL, &option_direct_render}, \ -{ "scale_quality", OPTION_BOOL, &option_scale_quality}, +{ "scale_quality", OPTION_BOOL, &option_scale_quality}, \ +{ "ask_overwrite", OPTION_BOOL, &option_ask_overwrite}, #endif -- cgit v1.2.3