From 1692db74e2eb281bda77763bb71597abe8a4eddf Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 13 Dec 2008 23:21:34 +0000 Subject: Remove Amiga-specific force_tabs svn path=/trunk/netsurf/; revision=5906 --- amiga/dist/NetSurf.guide | 9 --------- amiga/options.h | 8 ++++---- 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'amiga') diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide index a8b3eee67..619622c3e 100755 --- a/amiga/dist/NetSurf.guide +++ b/amiga/dist/NetSurf.guide @@ -39,21 +39,12 @@ The options file is stored in @{"Resources/Options" link Resources/Options/Main} @{b}sticky_context_menu@{ub} When disabled, context menu requires mouse button to be held down to keep it visible @{b}truecolour_mouse_pointers@{ub} Use 32-bit mouse pointers, when disabled NetSurf will use old-style 4 colour images (see Resources/Pointers) @{b}os_mouse_pointers@{ub} Don't override default and busy mouse pointers -@{b}always_open_tabs@{ub} Force opening tabs instead of windows (actually swaps the functions so ctrl-click now opens windows and middle mouse button opens tabs) See note [1] @{b}new_tab_is_active@{ub} Make new tab the active one @{b}kiosk_mode@{ub} No gadgets @{b}recent_file@{ub} Path to file to store recent history list @{b}arexx_dir@{ub} Path to ARexx scripts dir @{b}download_dir@{ub} default download destination (not used yet) -[1] There is another option called button_2_tab which does something similar, but does not force links that open new windows into new tabs instead. - -always_open_tabs | button_2_tab | middle button tabs | force tabs - 0 | 0 | No | No - 1 | 0 | Yes | Yes - 0 | 1 | Yes | No - 1 | 1 | No | Yes - @endnode @node arexx "ARexx port" diff --git a/amiga/options.h b/amiga/options.h index 4e38e6af0..5da70d0b2 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -33,12 +33,12 @@ extern bool option_context_menu; extern bool option_sticky_context_menu; extern bool option_truecolour_mouse_pointers; extern bool option_use_os_pointers; -extern bool option_force_tabs; extern bool option_new_tab_active; extern bool option_kiosk_mode; extern char *option_recent_file; extern char *option_arexx_dir; extern char *option_download_dir; +extern bool option_quick_text; #define EXTRA_OPTION_DEFINE \ bool option_verbose_log = false; \ @@ -54,12 +54,12 @@ bool option_context_menu = true; \ bool option_sticky_context_menu = true; \ bool option_truecolour_mouse_pointers = false; \ bool option_use_os_pointers = true; \ -bool option_force_tabs = false; \ bool option_new_tab_active = false; \ bool option_kiosk_mode = false; \ char *option_recent_file = 0; \ char *option_arexx_dir = 0; \ char *option_download_dir = 0; \ +bool option_quick_text = true; \ #define EXTRA_OPTION_TABLE \ { "verbose_log", OPTION_BOOL, &option_verbose_log}, \ @@ -75,10 +75,10 @@ char *option_download_dir = 0; \ { "sticky_context_menu", OPTION_BOOL, &option_sticky_context_menu}, \ { "truecolour_mouse_pointers", OPTION_BOOL, &option_truecolour_mouse_pointers}, \ { "os_mouse_pointers", OPTION_BOOL, &option_use_os_pointers}, \ -{ "always_open_tabs", OPTION_BOOL, &option_force_tabs}, \ { "new_tab_is_active", OPTION_BOOL, &option_new_tab_active}, \ { "kiosk_mode", OPTION_BOOL, &option_kiosk_mode}, \ { "recent_file", OPTION_STRING, &option_recent_file }, \ { "arexx_dir", OPTION_STRING, &option_arexx_dir }, \ -{ "download_dir", OPTION_STRING, &option_download_dir }, +{ "download_dir", OPTION_STRING, &option_download_dir }, \ +{ "quick_text", OPTION_BOOL, &option_quick_text}, #endif -- cgit v1.2.3