From 0ed0dfdc3b470cda1cf1a49e454563330ec51c54 Mon Sep 17 00:00:00 2001 From: Steve Fryatt Date: Thu, 13 Oct 2011 22:06:07 +0000 Subject: Add GUI option for external hotlist support. Reinstate list #ifdef from en template source. svn path=/trunk/netsurf/; revision=13043 --- riscos/templates/de | 42 ++++++++++++++++++++++++++++++++++++------ riscos/templates/en | 44 +++++++++++++++++++++++++++++++++++++++----- riscos/templates/fr | 44 +++++++++++++++++++++++++++++++++++++------- riscos/templates/nl | 42 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 148 insertions(+), 24 deletions(-) (limited to 'riscos/templates') diff --git a/riscos/templates/de b/riscos/templates/de index de0edccc1..06e992964 100644 --- a/riscos/templates/de +++ b/riscos/templates/de @@ -2638,7 +2638,7 @@ wimp_window { xscroll:0 yscroll:0 next:wimp_TOP - window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_HSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_NEW_FORMAT + window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_HSCROLL | wimp_WINDOW_NEW_FORMAT title_fg:wimp_COLOUR_BLACK title_bg:wimp_COLOUR_LIGHT_GREY work_fg:wimp_COLOUR_BLACK @@ -2860,7 +2860,7 @@ wimp_window { wimp_window { template_name:"con_inter" - visible:1114,368,1858,952 + visible:1094,218,1838,918 xscroll:0 yscroll:0 next:wimp_TOP @@ -2873,7 +2873,7 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-584,744,0 + extent:0,-700,744,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | 0x27000000 work_flags: sprite_area:&1 @@ -2991,7 +2991,7 @@ wimp_window { text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-552,188,-500 + extent:24,-668,188,-616 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3001,7 +3001,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:360,-552,524,-500 + extent:360,-668,524,-616 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3011,7 +3011,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:540,-560,724,-492 + extent:540,-676,724,-608 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3020,6 +3020,36 @@ wimp_window { text.size:4 text.validation:"R6,3" } + wimp_icon { + extent:16,-588,728,-492 + icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"" + text.size:* + text.validation:"R4" + } + wimp_icon { + extent:36,-520,240,-476 + icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text_and_sprite.text:"Hotlist" + text_and_sprite.size:23 + text_and_sprite.validation:"" + } + wimp_icon { + extent:32,-572,728,-528 + icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text_and_sprite.text:"Use external hotlist apps when available" + text_and_sprite.size:* + text_and_sprite.validation:"Soptoff,opton" + } } wimp_window { diff --git a/riscos/templates/en b/riscos/templates/en index 9f7de26fd..8dda2c6fc 100644 --- a/riscos/templates/en +++ b/riscos/templates/en @@ -833,7 +833,7 @@ wimp_window { wimp_window { template_name:"con_inter" - visible:1316,1004,2160,1588 + visible:2320,508,3164,1220 xscroll:0 yscroll:0 next:wimp_TOP @@ -846,7 +846,7 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-584,844,0 + extent:0,-712,844,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | 0x27000000 work_flags: sprite_area:&1 @@ -964,7 +964,7 @@ wimp_window { text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-552,188,-500 + extent:24,-676,188,-624 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -974,7 +974,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:456,-552,620,-500 + extent:456,-676,620,-624 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -984,7 +984,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:636,-560,820,-492 + extent:636,-684,820,-616 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -993,6 +993,36 @@ wimp_window { text.size:* text.validation:"R6,3" } + wimp_icon { + extent:16,-592,820,-496 + icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"" + text.size:* + text.validation:"R4" + } + wimp_icon { + extent:36,-524,240,-480 + icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text_and_sprite.text:"Hotlist" + text_and_sprite.size:23 + text_and_sprite.validation:"" + } + wimp_icon { + extent:32,-576,728,-532 + icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text_and_sprite.text:"Use external hotlist apps when available" + text_and_sprite.size:* + text_and_sprite.validation:"Soptoff,opton" + } } wimp_window { @@ -3398,7 +3428,11 @@ wimp_window { } wimp_icon { extent:32,-204,344,-160 +#ifdef WITH_PLUGIN + icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO +#else icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_DELETED | wimp_BUTTON_RADIO +#endif icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY diff --git a/riscos/templates/fr b/riscos/templates/fr index 309773478..170987c0c 100644 --- a/riscos/templates/fr +++ b/riscos/templates/fr @@ -2648,7 +2648,7 @@ wimp_window { xscroll:0 yscroll:0 next:wimp_TOP - window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_HSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_NEW_FORMAT + window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_HSCROLL | wimp_WINDOW_NEW_FORMAT title_fg:wimp_COLOUR_BLACK title_bg:wimp_COLOUR_LIGHT_GREY work_fg:wimp_COLOUR_BLACK @@ -3482,7 +3482,7 @@ wimp_window { wimp_window { template_name:"con_inter" - visible:368,234,1112,818 + visible:264,362,1008,1066 xscroll:0 yscroll:0 next:wimp_TOP @@ -3495,12 +3495,12 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-584,744,0 + extent:0,-772,744,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | 0x27000000 work_flags: sprite_area:&1 xmin:744 - ymin:584 + ymin:704 text_only:"Interface" wimp_icon { extent:16,-168,728,-24 @@ -3613,7 +3613,7 @@ wimp_window { text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-552,188,-500 + extent:24,-672,188,-620 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3623,7 +3623,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:360,-552,524,-500 + extent:360,-672,524,-620 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3633,7 +3633,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:540,-560,724,-492 + extent:540,-680,724,-612 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3642,6 +3642,36 @@ wimp_window { text.size:* text.validation:"R6,3" } + wimp_icon { + extent:16,-588,728,-492 + icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"" + text.size:* + text.validation:"R4" + } + wimp_icon { + extent:36,-520,240,-476 + icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text_and_sprite.text:"Hotlist" + text_and_sprite.size:23 + text_and_sprite.validation:"" + } + wimp_icon { + extent:32,-572,728,-528 + icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text_and_sprite.text:"Use external hotlist apps when available" + text_and_sprite.size:* + text_and_sprite.validation:"Soptoff,opton" + } } wimp_window { diff --git a/riscos/templates/nl b/riscos/templates/nl index bdd6554ff..293efeaff 100644 --- a/riscos/templates/nl +++ b/riscos/templates/nl @@ -833,7 +833,7 @@ wimp_window { wimp_window { template_name:"con_inter" - visible:136,384,880,968 + visible:1212,764,1956,1472 xscroll:0 yscroll:0 next:wimp_TOP @@ -846,7 +846,7 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-584,744,0 + extent:0,-708,744,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | 0x27000000 work_flags: sprite_area:&1 @@ -964,7 +964,7 @@ wimp_window { text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-552,188,-500 + extent:24,-676,188,-624 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -974,7 +974,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:360,-552,524,-500 + extent:360,-676,524,-624 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -984,7 +984,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:540,-560,724,-492 + extent:540,-684,724,-616 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -993,6 +993,36 @@ wimp_window { text.size:* text.validation:"R6,3" } + wimp_icon { + extent:16,-592,728,-496 + icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"" + text.size:* + text.validation:"R4" + } + wimp_icon { + extent:36,-524,240,-480 + icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text_and_sprite.text:"Hotlist" + text_and_sprite.size:23 + text_and_sprite.validation:"" + } + wimp_icon { + extent:32,-576,728,-532 + icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text_and_sprite.text:"Use external hotlist apps when available" + text_and_sprite.size:* + text_and_sprite.validation:"Soptoff,opton" + } } wimp_window { @@ -2798,7 +2828,7 @@ wimp_window { xscroll:0 yscroll:0 next:wimp_TOP - window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_HSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_NEW_FORMAT + window_flags:wimp_WINDOW_MOVEABLE | wimp_WINDOW_SCROLL_REPEAT | wimp_WINDOW_IGNORE_XEXTENT | wimp_WINDOW_IGNORE_YEXTENT | wimp_WINDOW_BOUNDED_ONCE | wimp_WINDOW_BACK_ICON | wimp_WINDOW_CLOSE_ICON | wimp_WINDOW_TITLE_ICON | wimp_WINDOW_TOGGLE_ICON | wimp_WINDOW_VSCROLL | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_HSCROLL | wimp_WINDOW_NEW_FORMAT title_fg:wimp_COLOUR_BLACK title_bg:wimp_COLOUR_LIGHT_GREY work_fg:wimp_COLOUR_BLACK -- cgit v1.2.3