February 2015 - netsurf-commits - listmaster.pepperfish.net

netsurf: branch master updated. release/3.2-748-ga81a783

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/a81a78394747e15f9a9b1... ...commit http://git.netsurf-browser.org/netsurf.git/commit/a81a78394747e15f9a9b1f9... ...tree http://git.netsurf-browser.org/netsurf.git/tree/a81a78394747e15f9a9b1f964... The branch, master has been updated via a81a78394747e15f9a9b1f964bd594e0e26b89d9 (commit) from 21cf3d6186c57047e819d18c83bac9aa5b95cfc3 (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/commit/?id=a81a78394747e15f9a9... commit a81a78394747e15f9a9b1f964bd594e0e26b89d9 Author: Dick Tanis <dtanis(a)ymail.com> Commit: Vincent Sanders <vince(a)kyllikki.org> Updated Dutch template and README translations diff --git a/riscos/distribution/LeesMij b/riscos/distribution/LeesMij new file mode 100644 index 0000000..a0d3ff4 --- /dev/null +++ b/riscos/distribution/LeesMij @@ -0,0 +1,73 @@ +NetSurf +======= + +Dit is een ontwikkelversie van NetSurf, een webbrowser met open +broncode. + +De nieuwste versie van NetSurf is verkrijgbaar via: + + http://www.netsurf-browser.org/ + + +Installatie +----------- + +De installatie gaat in drie stappen: + + 1. Gebruik de samenvoegfaciliteit van !Boot (te openen via de + besturingssysteeminstellingen -> !Boot) om de meegeleverde + !Boot-map samen te voegen met die van het systeem. + + Als het besturingssysteem geen !Boot-samenvoegfaciliteit + ondersteund, sleep dan de meegeleverde !Boot-map in de map + waarin de bestaande !Boot-structuur staat. + + 2. Gebruik de samenvoegfaciliteit van !System (te openen via de + besturingssysteeminstellingen -> !System) om de meegeleverde + !System-map samen te voegen met die van het systeem. + + 3. Sleep de !NetSurf-programmamap naar de gewenste map op de + harde schijf. + +Dubbelklik op het programma !NetSurf in de gekozen locatie om de +NetSurf-browser te starten. + + +Opmerking NetSurf vereist de WindowManager-module 3.80 of een + recentere versie. Deze is standaard aanwezig in RISC OS 4 + of een recentere versie. Voor RISC OS 3-gebruikers zijn + er twee mogelijkheden om NetSurf te kunnen gebruiken: + + - De 'Universal !Boot Sequence' van Acorn: + http://www.riscos.com/ftp_space/generic/uniboot/ + - HardDisc4-schijfstructuur van RISC OS Open: + https://www.riscosopen.org/content/downloads/common/ + + +Opmerking RISC OS 3.1 of oudere versies worden niet ondersteund. + + +Licenties +--------- + +NetSurf wordt geleverd onder de GPL, evenals verschillende andere +licenties voor de verschillende componenten die het programma +gebruikt. Bezoek in de NetSurf-browser het URL-adres 'about:licence' +voor meer informatie. + + +De meegeleverde !Boot- en !System-mappen bevatten items die door +derden zijn geproduceerd. De bijbehorende licenties zijn meegeleverd +in de map '3rdParty'. + +AcornURI + http://sudden.recoil.org/others/ + +Iconv + http://www.netsurf-browser.org/iconv/ + +SharedUnixLibrary + http://www.riscos.info/downloads/gccsdk/sharedunixlib/system.zip + +Tinct + http://www.tinct.net/tinct.asp diff --git a/riscos/templates/nl b/riscos/templates/nl index adef821..ab51d0d 100644 --- a/riscos/templates/nl +++ b/riscos/templates/nl @@ -21,8 +21,8 @@ wimp_window { sprite_area:&1 xmin:4 ymin:160 - text.text:"NetSurf configuration" - text.size:* + text.text:"NetSurf-instellingen" + text.size:22 text.validation:"" } @@ -47,7 +47,7 @@ wimp_window { sprite_area:&1 xmin:588 ymin:240 - text_only:"Voorraad" + text_only:"Buffer" wimp_icon { extent:16,-124,568,-24 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED @@ -55,62 +55,62 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { - extent:32,-52,268,-8 + extent:32,-52,300,-8 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:" Geheugen " - text_and_sprite.size:* + text_and_sprite.text:" Geheugenbuffer " + text_and_sprite.size:17 text_and_sprite.validation:"" } wimp_icon { - extent:40,-104,164,-60 + extent:60,-104,212,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Omvang" + text.text:"Grootte" text.size:13 text.validation:"" } wimp_icon { - extent:168,-108,336,-56 + extent:216,-108,380,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"512.0" text.size:10 - text.validation:"Pptr_write;Kta" + text.validation:"Pptr_write;Kta;A0-9." } wimp_icon { - extent:352,-100,384,-68 + extent:392,-100,424,-68 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:384,-100,416,-68 + extent:424,-100,456,-68 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:424,-104,480,-60 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED + extent:464,-104,528,-60 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY @@ -123,7 +123,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { @@ -132,22 +132,22 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:" Disc cache " - text_and_sprite.size:* + text_and_sprite.text:" Schijfbuffer " + text_and_sprite.size:15 text_and_sprite.validation:"" } wimp_icon { - extent:40,-232,164,-188 + extent:60,-232,212,-188 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Omvang" + text.text:"Grootte" text.size:13 text.validation:"" } wimp_icon { - extent:168,-236,336,-184 + extent:216,-236,380,-184 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -157,45 +157,45 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:352,-228,384,-196 + extent:392,-228,424,-196 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:384,-228,416,-196 + extent:424,-228,456,-196 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:424,-232,480,-192 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED + extent:464,-232,528,-192 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_only:"MB" } wimp_icon { - extent:44,-292,164,-248 + extent:12,-292,212,-248 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Expiry" - text.size:13 + text.text:"Bewaar max." + text.size:12 text.validation:"" } wimp_icon { - extent:168,-296,336,-244 + extent:216,-296,380,-244 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -205,68 +205,68 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:352,-288,384,-256 + extent:392,-288,424,-256 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:384,-288,416,-256 + extent:424,-288,456,-256 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:424,-292,500,-252 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED + extent:464,-292,560,-252 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"days" + text_only:"dagen" } wimp_icon { - extent:24,-396,188,-344 + extent:24,-396,200,-344 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:204,-396,368,-344 + extent:216,-396,376,-344 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:384,-404,568,-336 + extent:392,-404,568,-336 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"con_fonts" - visible:558,802,1270,1526 + visible:558,802,1282,1526 xscroll:0 yscroll:0 next:wimp_TOP @@ -279,91 +279,91 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-724,712,0 + extent:0,-724,724,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED work_flags: sprite_area:&1 xmin:712 ymin:724 - text_only:"Lettertypes" + text_only:"Lettertypen" wimp_icon { - extent:16,-424,696,-28 + extent:16,-424,704,-28 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-52,236,-8 + extent:32,-52,256,-8 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:" Font beeld " - text_and_sprite.size:* + text_and_sprite.text:" Lettertypen " + text_and_sprite.size:14 text_and_sprite.validation:"" } wimp_icon { - extent:20,-104,192,-60 + extent:24,-104,216,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Sans-serif" + text_only:"Schreefloos" } wimp_icon { - extent:196,-108,620,-56 + extent:220,-108,628,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-104,676,-60 + extent:640,-104,684,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:100,-164,192,-120 + extent:24,-164,216,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Serif" + text_only:"Met schreef" } wimp_icon { - extent:196,-168,620,-116 + extent:220,-168,628,-116 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-164,676,-120 + extent:640,-164,684,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:28,-224,192,-180 + extent:36,-224,216,-180 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -371,17 +371,17 @@ wimp_window { text_only:"Monospace" } wimp_icon { - extent:196,-228,620,-176 + extent:220,-228,628,-176 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-224,676,-180 + extent:640,-224,684,-180 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -391,149 +391,149 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:68,-284,192,-240 + extent:88,-284,216,-240 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Cursive" + text_only:"Cursief" } wimp_icon { - extent:196,-288,620,-236 + extent:220,-288,628,-236 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-284,676,-240 + extent:640,-284,684,-240 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:68,-344,192,-300 + extent:72,-344,216,-300 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Fantasy" + text_only:"Fantasie" } wimp_icon { - extent:196,-348,620,-296 + extent:220,-348,628,-296 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-344,676,-300 + extent:640,-344,684,-300 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:68,-404,192,-360 + extent:56,-404,216,-360 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Verstek" + text_only:"Standaard" } wimp_icon { - extent:196,-408,620,-356 + extent:220,-408,628,-356 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-404,676,-360 + extent:640,-404,684,-360 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:16,-612,696,-452 + extent:16,-612,704,-452 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-480,220,-436 + extent:32,-480,296,-436 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:" Font omvang " - text_and_sprite.size:* + text_and_sprite.text:" Lettergrootte " + text_and_sprite.size:16 text_and_sprite.validation:"" } wimp_icon { - extent:68,-532,192,-488 + extent:32,-532,200,-488 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Verstek" + text_only:"Standaard" } wimp_icon { - extent:196,-536,364,-484 + extent:204,-536,372,-484 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"12.3" text.size:10 - text.validation:"Pptr_write;Kta" + text.validation:"Pptr_write;Kta;A0-9." } wimp_icon { - extent:380,-528,412,-496 + extent:388,-528,420,-496 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:412,-528,444,-496 + extent:420,-528,452,-496 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:452,-532,492,-488 + extent:460,-532,500,-488 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -541,7 +541,7 @@ wimp_window { text_only:"pt" } wimp_icon { - extent:60,-592,192,-548 + extent:52,-592,200,-548 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -549,37 +549,37 @@ wimp_window { text_only:"Minimum" } wimp_icon { - extent:196,-596,364,-544 + extent:204,-596,372,-544 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"12.3" text.size:10 - text.validation:"Pptr_write;Kta" + text.validation:"Pptr_write;Kta;A0-9." } wimp_icon { - extent:380,-588,412,-556 + extent:388,-588,420,-556 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:412,-588,444,-556 + extent:420,-588,452,-556 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:452,-592,492,-548 + extent:460,-592,500,-548 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -587,40 +587,40 @@ wimp_window { text_only:"pt" } wimp_icon { - extent:24,-696,188,-644 + extent:24,-696,200,-644 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:332,-696,496,-644 + extent:340,-696,504,-644 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:512,-704,696,-636 + extent:520,-704,704,-636 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"con_home" - visible:284,152,1084,448 + visible:808,592,1608,888 xscroll:0 yscroll:0 next:wimp_TOP @@ -647,7 +647,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { @@ -661,12 +661,12 @@ wimp_window { text_and_sprite.validation:"" } wimp_icon { - extent:48,-108,120,-64 + extent:24,-108,120,-64 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"URL" + text_only:"Adres" } wimp_icon { extent:124,-112,712,-60 @@ -689,23 +689,23 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:124,-164,676,-120 + extent:124,-164,732,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_SELECTED | wimp_BUTTON_RADIO icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:"Open nieuwe pagina tijdens starten" - text_and_sprite.size:* + text_and_sprite.text:"Browservenster openen na opstarten" + text_and_sprite.size:35 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-264,188,-212 + extent:24,-264,200,-212 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { @@ -715,7 +715,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -724,15 +724,15 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"con_image" - visible:828,926,1504,1514 + visible:1488,822,2164,1410 xscroll:0 yscroll:0 next:wimp_TOP @@ -746,12 +746,14 @@ wimp_window { highlight_bg:wimp_COLOUR_CREAM extra_flags: extent:0,-588,676,0 - title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED + title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED work_flags: sprite_area:&1 xmin:676 ymin:588 - text_only:"Beelden" + text.text:"Afbeeldingen" + text.size:13 + text.validation:"" wimp_icon { extent:16,-292,660,-24 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED @@ -759,21 +761,21 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { - extent:32,-52,284,-8 + extent:32,-52,396,-8 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:" Beeld kwaliteit " - text_and_sprite.size:* + text_and_sprite.text:" Afbeeldingskwaliteit " + text_and_sprite.size:23 text_and_sprite.validation:"" } wimp_icon { - extent:32,-108,204,-64 + extent:40,-108,216,-64 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -781,12 +783,12 @@ wimp_window { text_only:"Voorgrond" } wimp_icon { - extent:208,-112,592,-60 + extent:220,-112,592,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Error diffused" + text.text:"RISC OS-routines" text.size:256 text.validation:"R2" } @@ -801,7 +803,7 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:32,-168,204,-124 + extent:24,-168,216,-124 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -809,12 +811,12 @@ wimp_window { text_only:"Achtergrond" } wimp_icon { - extent:208,-172,592,-120 + extent:220,-172,592,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Error diffused" + text.text:"RISC OS-routines" text.size:256 text.validation:"R2" } @@ -842,11 +844,11 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { - extent:32,-348,284,-304 + extent:32,-348,236,-304 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -856,73 +858,73 @@ wimp_window { text_and_sprite.validation:"" } wimp_icon { - extent:20,-404,208,-360 + extent:20,-404,232,-360 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Snelheid limiet" - text.size:* + text.text:"Animatietijd" + text.size:15 text.validation:"" } wimp_icon { - extent:212,-408,380,-356 + extent:236,-408,404,-356 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"12.34" - text.size:* - text.validation:"Pptr_write;Kta" + text.size:6 + text.validation:"Pptr_write;Kta;A0-9." } wimp_icon { - extent:396,-400,428,-368 + extent:420,-400,452,-368 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:428,-400,460,-368 + extent:452,-400,484,-368 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:468,-404,592,-360 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED + extent:492,-404,644,-360 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"secondes" - text.size:* + text.text:"seconden" + text.size:9 text.validation:"" } wimp_icon { - extent:212,-460,556,-416 + extent:236,-460,616,-416 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:"Animaties uitzetten" - text_and_sprite.size:* + text_and_sprite.size:20 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-560,188,-508 + extent:24,-560,200,-508 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { @@ -932,7 +934,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -941,15 +943,15 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"con_inter" - visible:1212,692,1956,1472 + visible:2320,436,3164,1220 xscroll:0 yscroll:0 next:wimp_TOP @@ -962,61 +964,63 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-780,744,0 - title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | 0x27000000 + extent:0,-784,844,0 + title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:744 ymin:584 - text_only:"Interface" + text.text:"Gebruikersinterface" + text.size:20 + text.validation:"" wimp_icon { - extent:16,-168,728,-24 + extent:16,-168,820,-24 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-52,492,-8 + extent:32,-52,576,-8 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:" Ophalen / Opslaan van bestanden " - text_and_sprite.size:* + text_and_sprite.text:" Ophalen / opslaan van bestanden " + text_and_sprite.size:34 text_and_sprite.validation:"" } wimp_icon { - extent:32,-100,656,-56 + extent:32,-100,748,-56 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:"Bestand opslaan zonder extensie" - text_and_sprite.size:39 + text_and_sprite.text:"Bestand opslaan zonder bestandsextensie" + text_and_sprite.size:40 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:32,-152,676,-108 + extent:32,-152,808,-108 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:"Vraag toestemming voor bestand overschrijven" - text_and_sprite.size:* + text_and_sprite.text:"Toestemming vragen bij overschrijven" + text_and_sprite.size:37 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:16,-344,728,-200 + extent:16,-344,820,-200 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.size:1 text.validation:"R4" } wimp_icon { @@ -1026,37 +1030,37 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:" Interactieve kenmerken " - text_and_sprite.size:* + text_and_sprite.size:25 text_and_sprite.validation:"" } wimp_icon { - extent:32,-276,744,-232 + extent:32,-276,804,-232 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:"Toon recent bezochte URLs tijdens typen" - text_and_sprite.size:* + text_and_sprite.text:"Recent bezochte adressen tonen tijdens typen" + text_and_sprite.size:45 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:32,-328,872,-284 + extent:32,-328,776,-284 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:"Hover URLs by the pointer for local history" - text_and_sprite.size:* + text_and_sprite.text:"Adressen tonen bij de venstergeschiedenis" + text_and_sprite.size:42 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:16,-468,728,-372 + extent:16,-468,820,-372 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.size:1 text.validation:"R4" } wimp_icon { @@ -1065,58 +1069,58 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:" Duimnagels " + text_and_sprite.text:" Miniaturen " text_and_sprite.size:23 text_and_sprite.validation:"" } wimp_icon { - extent:32,-452,648,-408 + extent:32,-452,708,-408 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:"Gebruik duimnagels voor icoon-vensters" + text_and_sprite.text:"Miniaturen gebruiken bij symboliseren" text_and_sprite.size:42 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-748,188,-696 + extent:24,-748,200,-696 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:360,-748,524,-696 + extent:456,-748,620,-696 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:540,-756,724,-688 + extent:636,-756,820,-688 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } wimp_icon { - extent:16,-664,728,-496 + extent:16,-664,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.size:1 text.validation:"R4" } wimp_icon { @@ -1125,7 +1129,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:"Hotlist" + text_and_sprite.text:"Favorieten" text_and_sprite.size:23 text_and_sprite.validation:"" } @@ -1135,27 +1139,27 @@ wimp_window { 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.text:"Extern programma voor favorietenlijst" + text_and_sprite.size:38 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:28,-640,232,-588 + extent:24,-644,256,-592 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Hotlist path" - text.size:* + text.text:"Programmapad" + text.size:13 text.validation:"" } wimp_icon { - extent:232,-640,708,-588 + extent:260,-644,800,-592 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE - text.text:"Writable icon" + text.text:"Schrijfbaar veld" text.size:256 text.validation:"Pptr_write;Kta" } @@ -1163,7 +1167,7 @@ wimp_window { wimp_window { template_name:"con_lang" - visible:170,956,914,1256 + visible:1574,956,2318,1256 xscroll:0 yscroll:0 next:wimp_TOP @@ -1190,7 +1194,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { @@ -1204,15 +1208,15 @@ wimp_window { text_and_sprite.validation:"" } wimp_icon { - extent:48,-108,204,-64 + extent:64,-108,224,-64 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Programma" + text_only:"Interface" } wimp_icon { - extent:208,-112,660,-60 + extent:228,-112,660,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1232,17 +1236,15 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:40,-168,204,-124 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED + extent:32,-168,224,-124 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Web pagina's" - text.size:* - text.validation:"" + text_only:"Webpagina's" } wimp_icon { - extent:208,-172,660,-120 + extent:228,-172,660,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1262,13 +1264,13 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:24,-272,188,-220 + extent:24,-272,200,-220 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { @@ -1278,7 +1280,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -1287,8 +1289,8 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } @@ -1322,27 +1324,27 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { - extent:32,-52,332,-8 + extent:32,-52,392,-8 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:" Beschikbare thema's " - text_and_sprite.size:* + text_and_sprite.size:22 text_and_sprite.validation:"" } wimp_icon { - extent:24,-576,188,-524 + extent:24,-576,200,-524 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { @@ -1352,7 +1354,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -1361,15 +1363,15 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"download" - visible:486,610,1282,890 + visible:486,610,1394,890 xscroll:0 yscroll:0 next:wimp_TOP @@ -1382,63 +1384,63 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-280,796,0 + extent:0,-280,908,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 - xmin:80 + xmin:88 ymin:28 - text.text:"NetSurf ophaalproces" - text.size:* + text.text:"NetSurf-ophaalproces" + text.size:21 text.validation:"" wimp_icon { - extent:364,-84,432,-16 + extent:420,-84,488,-16 icon_flags:wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY sprite.id:"file_ddc" - sprite.size:* + sprite.size:9 sprite.area:&1 } wimp_icon { - extent:204,-152,788,-100 + extent:204,-152,900,-100 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"http://netsurf.sourceforge.net/netsurf.zip" - text.size:* + text.size:43 text.validation:"R2" } wimp_icon { - extent:204,-212,788,-160 + extent:204,-212,900,-160 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"netsurf" - text.size:* + text.size:8 text.validation:"Pptr_write" } wimp_icon { - extent:204,-212,788,-160 + extent:204,-212,900,-160 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"ADFS::A7000+.$.netsurf" - text.size:* + text.size:23 text.validation:"R2" } wimp_icon { - extent:8,-272,788,-220 + extent:8,-272,900,-220 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { @@ -1449,13 +1451,13 @@ wimp_window { icon_bg:wimp_COLOUR_CREAM } wimp_icon { - extent:12,-268,784,-224 + extent:12,-268,896,-224 icon_flags:wimp_ICON_TEXT | 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:"84.4KB of 1.1MB � 26.6KB/s � 0:39 remaining" - text.size:* + text.text:"999 KB compleet � gemiddeld 926.6 KB/s � 0:39 resterend" + text.size:72 text.validation:"" } wimp_icon { @@ -1497,14 +1499,14 @@ wimp_window { sprite_area:&1 xmin:0 ymin:0 - text.text:"History" - text.size:* + text.text:" Venstergeschiedenis " + text.size:22 text.validation:"" } wimp_window { template_name:"info" - visible:752,452,1372,700 + visible:752,324,1412,700 xscroll:0 yscroll:0 next:wimp_TOP @@ -1517,14 +1519,14 @@ wimp_window { scroll_inner:wimp_COLOUR_ORANGE highlight_bg:wimp_COLOUR_LIGHT_GREY extra_flags: - extent:0,-248,620,0 + extent:0,-376,660,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED work_flags:wimp_BUTTON_CLICK sprite_area:&1 - xmin:620 + xmin:660 ymin:248 - text.text:"Over dit programma" - text.size:* + text.text:"Programma-informatie" + text.size:21 text.validation:"" wimp_icon { extent:672,-200,848,-152 @@ -1535,47 +1537,47 @@ wimp_window { text_only:"OK" } wimp_icon { - extent:152,-60,612,-8 + extent:168,-60,652,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"NetSurf" - text.size:* + text.size:8 text.validation:"R2" } wimp_icon { - extent:152,-120,612,-68 + extent:168,-120,652,-68 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Open broncode web browser" - text.size:* + text.text:"Webbrowser met open broncode" + text.size:29 text.validation:"R2" } wimp_icon { - extent:152,-180,612,-128 + extent:168,-180,652,-128 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"� NetSurf developers" + text.text:"� NetSurf-ontwikkelaars" text.size:40 text.validation:"R2" } wimp_icon { - extent:152,-240,612,-188 + extent:168,-368,652,-316 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"CVS test build" + text.text:"CVS-testuitgave" text.size:40 text.validation:"R2" } wimp_icon { - extent:60,-56,148,-12 + extent:72,-56,164,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1583,7 +1585,7 @@ wimp_window { text_only:"Naam" } wimp_icon { - extent:24,-116,148,-72 + extent:40,-116,164,-72 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1591,7 +1593,7 @@ wimp_window { text_only:"Functie" } wimp_icon { - extent:24,-176,148,-132 + extent:40,-176,164,-132 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1599,18 +1601,38 @@ wimp_window { text_only:"Auteurs" } wimp_icon { - extent:24,-236,148,-192 + extent:40,-364,164,-320 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_only:"Versie" } + wimp_icon { + extent:168,-308,652,-188 + icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"G. van Katwijk & D. Tanis g.vankatwijk(a)freeler.nl" + text.size:50 + text.validation:"R2;L" + } + wimp_icon { + extent:0,-304,164,-192 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"Vertaling & contact" + text.size:20 + text.validation:"L" + } } wimp_window { template_name:"login" - visible:582,400,1258,736 + visible:582,400,1322,736 xscroll:0 yscroll:0 next:wimp_TOP @@ -1623,37 +1645,37 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-336,676,0 + extent:0,-336,740,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 - xmin:676 + xmin:740 ymin:336 - text.text:"Authentificeren" - text.size:* + text.text:"Website-authenticatie" + text.size:22 text.validation:"" wimp_icon { - extent:532,-324,664,-256 + extent:596,-324,728,-256 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Aanmelden" - text.size:* + text.text:"Login" + text.size:8 text.validation:"R6,3;Nok" } wimp_icon { - extent:380,-316,508,-264 + extent:408,-316,572,-264 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3;Ncancel" } wimp_icon { - extent:168,-60,668,-8 + extent:252,-60,732,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1663,7 +1685,7 @@ wimp_window { text.validation:"R2" } wimp_icon { - extent:168,-120,668,-68 + extent:252,-120,732,-68 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1673,7 +1695,7 @@ wimp_window { text.validation:"R2" } wimp_icon { - extent:168,-180,668,-128 + extent:252,-180,732,-128 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1683,7 +1705,7 @@ wimp_window { text.validation:"Pptr_write;Kta;N401username" } wimp_icon { - extent:168,-240,668,-188 + extent:252,-240,732,-188 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1693,25 +1715,25 @@ wimp_window { text.validation:"Pptr_write;Kta;D*" } wimp_icon { - extent:88,-56,164,-12 + extent:100,-56,248,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Host" + text_only:"Website" } wimp_icon { - extent:16,-176,164,-132 + extent:4,-176,248,-132 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Gebruikernaam" - text.size:* + text.text:"Gebruikersnaam" + text.size:15 text.validation:"" } wimp_icon { - extent:24,-236,164,-192 + extent:16,-236,248,-192 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1719,7 +1741,7 @@ wimp_window { text_only:"Wachtwoord" } wimp_icon { - extent:68,-116,164,-72 + extent:108,-116,248,-72 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1776,7 +1798,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"URL" + text_only:"Adres" } wimp_icon { extent:112,-120,532,-68 @@ -1789,13 +1811,13 @@ wimp_window { text.validation:"Pptr_write;Kta" } wimp_icon { - extent:304,-200,432,-148 + extent:268,-200,432,-148 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -1863,13 +1885,13 @@ wimp_window { text.validation:"Pptr_write;Kta" } wimp_icon { - extent:304,-140,432,-88 + extent:268,-140,432,-88 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -1905,7 +1927,7 @@ wimp_window { sprite_area:&1 xmin:788 ymin:188 - text.text:"Over dit object" + text.text:"Objectinformatie" text.size:20 text.validation:"" wimp_icon { @@ -1914,7 +1936,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -1924,7 +1946,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -1934,7 +1956,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -1945,7 +1967,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY sprite.id:"file_faf" - sprite.size:* + sprite.size:9 sprite.area:&1 } wimp_icon { @@ -1965,12 +1987,12 @@ wimp_window { text_only:"Type" } wimp_icon { - extent:128,-56,200,-12 + extent:104,-56,200,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"URL" + text_only:"Adres" } } @@ -1990,22 +2012,24 @@ wimp_window { highlight_bg:wimp_COLOUR_CREAM extra_flags: extent:0,-156,800,0 - title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | 0x27000000 + title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:0 ymin:0 - text_only:"Open URL" + text.text:"Weblocatie openen" + text.size:18 + text.validation:"" wimp_icon { - extent:20,-56,92,-12 + extent:8,-56,104,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"URL" + text_only:"Adres" } wimp_icon { - extent:96,-60,736,-8 + extent:108,-60,736,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2015,13 +2039,13 @@ wimp_window { text.validation:"Pptr_write;Kta" } wimp_icon { - extent:504,-136,632,-84 + extent:468,-136,632,-84 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -2067,8 +2091,8 @@ wimp_window { sprite_area:&1 xmin:792 ymin:248 - text.text:"Over dit document" - text.size:* + text.text:"Documentinfo" + text.size:13 text.validation:"" wimp_icon { extent:208,-60,784,-8 @@ -2076,7 +2100,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -2086,7 +2110,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -2096,7 +2120,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -2106,7 +2130,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -2117,19 +2141,19 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY sprite.id:"file_faf" - sprite.size:* + sprite.size:9 sprite.area:&1 } wimp_icon { - extent:132,-116,204,-72 + extent:108,-116,204,-72 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"URL" + text_only:"Adres" } wimp_icon { - extent:64,-176,204,-132 + extent:60,-176,204,-132 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2137,7 +2161,7 @@ wimp_window { text_only:"Codering" } wimp_icon { - extent:124,-236,204,-192 + extent:116,-236,204,-192 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2156,7 +2180,7 @@ wimp_window { wimp_window { template_name:"print" - visible:472,136,1072,708 + visible:472,136,1132,708 xscroll:0 yscroll:0 next:wimp_TOP @@ -2169,23 +2193,23 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-572,600,0 + extent:0,-572,700,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:600 ymin:572 - text.text:"Geen afdrukker" - text.size:20 + text.text:"Geen stuurprogramma aanwezig" + text.size:29 text.validation:"" wimp_icon { - extent:12,-176,588,-24 + extent:12,-176,652,-24 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.size:1 text.validation:"R4" } wimp_icon { @@ -2195,7 +2219,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"einde van de webpagina" - text_and_sprite.size:* + text_and_sprite.size:23 text_and_sprite.validation:"Sradiooff,radioon" } wimp_icon { @@ -2225,7 +2249,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { @@ -2235,7 +2259,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { @@ -2245,37 +2269,37 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"pagina('s)" - text.size:* + text.size:11 text.validation:"" } wimp_icon { - extent:12,-236,420,-192 + extent:12,-236,512,-192 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:"Toon voorgrondafbeeldingen" - text_and_sprite.size:* + text_and_sprite.text:"Voorgrondafbeeldingen" + text_and_sprite.size:22 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:12,-288,420,-244 + extent:12,-288,528,-244 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:"Toon achtergrondafbeeldingen" - text_and_sprite.size:* + text_and_sprite.text:"Achtergrondafbeeldingen" + text_and_sprite.size:24 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:12,-340,372,-296 + extent:12,-340,492,-296 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:"In de achtergrond afdrukken" - text_and_sprite.size:* + text_and_sprite.text:"Afdrukken in achtergrond" + text_and_sprite.size:25 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { @@ -2285,7 +2309,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"Staand" - text_and_sprite.size:* + text_and_sprite.size:7 text_and_sprite.validation:"Sradiooff,radioon" } wimp_icon { @@ -2295,11 +2319,11 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"Liggend" - text_and_sprite.size:* + text_and_sprite.size:8 text_and_sprite.validation:"Sradiooff,radioon" } wimp_icon { - extent:432,-456,512,-404 + extent:480,-456,560,-404 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2309,47 +2333,47 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:524,-448,556,-416 + extent:572,-448,604,-416 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:556,-448,588,-416 + extent:604,-448,636,-416 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:304,-552,432,-500 + extent:292,-552,456,-500 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:456,-560,588,-492 + extent:480,-560,648,-492 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Afdrukkn" - text.size:* + text.text:"Druk af" + text.size:8 text.validation:"R6,3" } wimp_icon { - extent:320,-452,428,-408 + extent:344,-452,476,-408 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2357,40 +2381,40 @@ wimp_window { text_only:"Kopie�n" } wimp_icon { - extent:-16,-480,608,-472 + extent:-16,-480,676,-472 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:32,-48,364,-4 + extent:32,-48,448,-4 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:" Stop afdrukken na " - text_and_sprite.size:* + text_and_sprite.text:" Afdrukken stoppen na " + text_and_sprite.size:23 text_and_sprite.validation:"" } wimp_icon { - extent:252,-400,676,-356 + extent:232,-400,656,-356 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:"Alle tekst in zwart" - text_and_sprite.size:* + text_and_sprite.size:20 text_and_sprite.validation:"Soptoff,opton" } } wimp_window { template_name:"query" - visible:142,562,942,806 + visible:142,526,942,806 xscroll:0 yscroll:0 next:wimp_TOP @@ -2403,7 +2427,7 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_LIGHT_GREY extra_flags: - extent:0,-244,800,0 + extent:0,-280,800,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 @@ -2413,43 +2437,43 @@ wimp_window { text.size:21 text.validation:"" wimp_icon { - extent:92,-148,792,-8 + extent:92,-184,792,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Message" + text.text:"Bericht" text.size:300 text.validation:"R2;L" } wimp_icon { - extent:604,-232,788,-164 + extent:604,-268,788,-200 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"012345678901234567" - text.size:* + text.size:19 text.validation:"R6,3" } wimp_icon { - extent:424,-224,588,-172 + extent:424,-260,588,-208 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"012345678901234567" - text.size:* + text.text:"0123456789012345678901" + text.size:23 text.validation:"R5,3" } wimp_icon { - extent:16,-224,132,-172 + extent:16,-260,132,-208 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Hulp" - text.size:* + text.size:5 text.validation:"R5,3" } wimp_icon { @@ -2464,7 +2488,7 @@ wimp_window { wimp_window { template_name:"saveas" - visible:824,676,1140,924 + visible:824,676,1164,924 xscroll:0 yscroll:0 next:wimp_TOP @@ -2477,7 +2501,7 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-248,316,0 + extent:0,-248,340,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | 0x27000000 work_flags: sprite_area:&1 @@ -2485,7 +2509,7 @@ wimp_window { ymin:244 text_only:"Bewaar als" wimp_icon { - extent:124,-84,192,-16 + extent:144,-84,212,-16 icon_flags:wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2495,7 +2519,7 @@ wimp_window { sprite.area:&1 } wimp_icon { - extent:8,-152,308,-100 + extent:8,-152,332,-100 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2505,30 +2529,30 @@ wimp_window { text.validation:"Pptr_write" } wimp_icon { - extent:172,-236,304,-168 + extent:184,-236,332,-168 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Bewaar" - text.size:* + text.size:7 text.validation:"R6,3" } wimp_icon { - extent:20,-228,148,-176 + extent:8,-228,168,-176 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } } wimp_window { template_name:"search" - visible:1036,684,1680,928 + visible:1036,684,1792,928 xscroll:0 yscroll:0 next:wimp_TOP @@ -2541,17 +2565,17 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-244,644,0 + extent:0,-244,756,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 - xmin:644 + xmin:756 ymin:244 text.text:"Tekst zoeken" - text.size:* + text.size:13 text.validation:"" wimp_icon { - extent:96,-60,580,-8 + extent:96,-60,692,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2561,17 +2585,17 @@ wimp_window { text.validation:"KN;Pptr_write" } wimp_icon { - extent:96,-116,352,-72 + extent:96,-116,476,-72 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:"Hoofdletter gevoelig" - text_and_sprite.size:* + text_and_sprite.text:"Hoofdlettergevoelig" + text_and_sprite.size:20 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:500,-228,632,-160 + extent:568,-228,744,-160 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 @@ -2581,43 +2605,43 @@ wimp_window { text.validation:"R6,3" } wimp_icon { - extent:348,-220,484,-168 + extent:424,-220,552,-168 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Vorige" - text.size:* + text.size:7 text.validation:"R5,3" } wimp_icon { - extent:204,-220,332,-168 + extent:248,-220,408,-168 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:16,-216,196,-172 + extent:12,-216,232,-172 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Niet gevonden" - text.size:* + text.size:14 text.validation:"" } wimp_icon { - extent:-8,-148,652,-140 + extent:-8,-148,772,-140 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.size:1 text.validation:"R2" } wimp_icon { @@ -2629,7 +2653,7 @@ wimp_window { text_only:"Zoek" } wimp_icon { - extent:588,-56,632,-12 + extent:700,-56,744,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_ICON_SHADED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2639,20 +2663,20 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:408,-116,636,-72 + extent:472,-116,748,-72 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:"Toon alles" - text_and_sprite.size:* + text_and_sprite.text:"Alles markeren" + text_and_sprite.size:15 text_and_sprite.validation:"Soptoff,opton" } } wimp_window { template_name:"theme_inst" - visible:374,590,1174,834 + visible:374,554,1174,834 xscroll:0 yscroll:0 next:wimp_TOP @@ -2665,43 +2689,43 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-244,800,0 + extent:0,-280,800,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:800 - ymin:244 - text.text:"NetSurf thema installatie" - text.size:* + ymin:280 + text.text:"NetSurf-thema-intallatie" + text.size:25 text.validation:"" wimp_icon { - extent:92,-148,792,-8 + extent:92,-184,792,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Message" + text.text:"Bericht" text.size:300 text.validation:"R2;L" } wimp_icon { - extent:640,-232,788,-164 + extent:588,-268,788,-200 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Installeer" - text.size:* + text.size:11 text.validation:"R6,3" } wimp_icon { - extent:488,-224,616,-172 + extent:404,-260,564,-208 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -2735,14 +2759,14 @@ wimp_window { sprite_area:&1 xmin:0 ymin:0 - text_only:"<Untitled>" + text_only:"<Naamloos>" wimp_icon { extent:0,-40,300,4 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Comment" + text.text:"Commentaar" text.size:256 text.validation:"" } @@ -2795,12 +2819,12 @@ wimp_window { sprite_area:&1 xmin:0 ymin:0 - text_only:"<Untitled>" + text_only:"<Naamloos>" } wimp_window { template_name:"warning" - visible:320,850,1120,1094 + visible:320,814,1120,1094 xscroll:0 yscroll:0 next:wimp_TOP @@ -2813,43 +2837,43 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-244,800,0 + extent:0,-280,800,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:0 ymin:0 text.text:"Waarschuwing van NetSurf" - text.size:* + text.size:25 text.validation:"" wimp_icon { - extent:92,-148,792,-8 + extent:92,-184,792,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Message" + text.text:"Bericht" text.size:300 text.validation:"R2;L" } wimp_icon { - extent:608,-232,788,-164 + extent:608,-268,788,-200 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Verder" - text.size:* + text.size:7 text.validation:"R6,3" } wimp_icon { - extent:484,-224,584,-172 + extent:484,-260,584,-208 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Hulp" - text.size:* + text.size:5 text.validation:"R5,3" } wimp_icon { @@ -2864,7 +2888,7 @@ wimp_window { wimp_window { template_name:"zoom" - visible:182,356,630,578 + visible:182,356,650,578 xscroll:0 yscroll:0 next:wimp_TOP @@ -2877,17 +2901,17 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-224,448,0 + extent:0,-224,468,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED work_flags: sprite_area:&1 - xmin:448 + xmin:468 ymin:220 text.text:"Pagina schalen" - text.size:* + text.size:15 text.validation:"" wimp_icon { - extent:8,-56,100,-12 + extent:0,-56,112,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2895,7 +2919,7 @@ wimp_window { text_only:"Schaal" } wimp_icon { - extent:104,-60,204,-8 + extent:116,-60,212,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2905,27 +2929,27 @@ wimp_window { text.validation:"Pptr_write;KTA;A0-9." } wimp_icon { - extent:216,-52,248,-20 + extent:224,-52,256,-20 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sdown,pdown" } wimp_icon { - extent:248,-52,280,-20 + extent:256,-52,288,-20 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sup,pup" } wimp_icon { - extent:284,-56,324,-12 + extent:292,-56,332,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_HCENTRED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2933,12 +2957,12 @@ wimp_window { text_only:"%" } wimp_icon { - extent:104,-112,416,-68 + extent:116,-112,460,-68 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:"Schaal alle frames" + text_and_sprite.text:"Frames meeschalen" text_and_sprite.size:20 text_and_sprite.validation:"Soptoff,opton" } @@ -2949,34 +2973,34 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:164,-204,292,-152 + extent:148,-204,308,-152 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:308,-212,440,-144 + extent:324,-212,460,-144 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Schaal" - text.size:* + text.size:7 text.validation:"R6,3" } } wimp_window { template_name:"ssldisplay" - visible:142,60,1102,600 + visible:862,768,1870,1308 xscroll:0 yscroll:0 next:wimp_TOP @@ -2989,23 +3013,23 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-540,960,0 + extent:0,-540,1008,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 - xmin:960 + xmin:1008 ymin:76 - text.text:"SSL certificaat" - text.size:* + text.text:"SSL-certificaat" + text.size:16 text.validation:"" wimp_icon { - extent:16,-520,944,-24 + extent:16,-520,992,-24 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.size:1 text.validation:"R4" } wimp_icon { @@ -3014,12 +3038,12 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:" Certificaat details " - text_and_sprite.size:* + text_and_sprite.text:" Certificaatedetails " + text_and_sprite.size:22 text_and_sprite.validation:"" } wimp_icon { - extent:24,-108,148,-64 + extent:72,-108,196,-64 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3027,37 +3051,37 @@ wimp_window { text_only:"Versie" } wimp_icon { - extent:152,-108,264,-56 + extent:200,-108,312,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:252,-104,424,-60 + extent:320,-104,528,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Geldig vanaf" - text.size:* + text.size:13 text.validation:"" } wimp_icon { - extent:428,-108,928,-56 + extent:532,-108,976,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:68,-168,148,-124 + extent:116,-168,196,-124 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3065,17 +3089,17 @@ wimp_window { text_only:"Type" } wimp_icon { - extent:152,-168,264,-116 + extent:200,-168,312,-116 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:236,-164,424,-120 + extent:340,-164,528,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3083,17 +3107,17 @@ wimp_window { text_only:"Geldig tot" } wimp_icon { - extent:428,-168,928,-116 + extent:532,-168,976,-116 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:40,-228,148,-184 + extent:68,-228,196,-184 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3101,17 +3125,17 @@ wimp_window { text_only:"Serienr" } wimp_icon { - extent:152,-228,928,-176 + extent:200,-228,976,-176 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:40,-288,148,-244 + extent:56,-288,196,-244 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3119,17 +3143,17 @@ wimp_window { text_only:"Uitgever" } wimp_icon { - extent:152,-376,928,-236 + extent:200,-376,976,-236 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2;L" } wimp_icon { - extent:24,-432,148,-388 + extent:24,-432,196,-388 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3137,20 +3161,20 @@ wimp_window { text_only:"Onderwerp" } wimp_icon { - extent:152,-504,928,-384 + extent:200,-504,976,-384 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2;L" } } wimp_window { template_name:"con_secure" - visible:514,132,1106,496 + visible:1590,788,2206,1152 xscroll:0 yscroll:0 next:wimp_TOP @@ -3163,21 +3187,23 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-364,592,0 - title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED + extent:0,-364,616,0 + title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED work_flags: sprite_area:&1 - xmin:592 + xmin:616 ymin:364 - text_only:"Veiligheid" + text.text:"Privacy & veiligheid" + text.size:21 + text.validation:"" wimp_icon { - extent:16,-120,576,-24 + extent:16,-120,600,-24 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.size:1 text.validation:"R4" } wimp_icon { @@ -3187,27 +3213,27 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:" Cross-site privacy " - text_and_sprite.size:* + text_and_sprite.size:21 text_and_sprite.validation:"" } wimp_icon { - extent:32,-104,568,-60 + extent:32,-104,592,-60 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:"Send site referral information" - text_and_sprite.size:* + text_and_sprite.text:"Sitegerelateerde info verzenden" + text_and_sprite.size:32 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:16,-252,576,-148 + extent:16,-252,600,-148 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.size:1 text.validation:"R4" } wimp_icon { @@ -3216,91 +3242,93 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:"Site historie " + text_and_sprite.text:"Sitegeschiedenis " text_and_sprite.size:18 text_and_sprite.validation:"" } wimp_icon { - extent:24,-228,164,-184 + extent:28,-228,112,-184 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Duur" + text_only:"Max." } wimp_icon { - extent:168,-232,336,-180 + extent:116,-232,240,-180 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"12" text.size:4 - text.validation:"Pptr_write;Kta" + text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:352,-224,384,-192 + extent:252,-224,284,-192 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:384,-224,416,-192 + extent:284,-224,316,-192 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:424,-228,500,-184 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED + extent:324,-228,596,-184 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"dagen" + text.text:"dagen onthouden" + text.size:16 + text.validation:"" } wimp_icon { - extent:24,-336,188,-284 + extent:24,-336,200,-284 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:208,-336,372,-284 + extent:232,-336,396,-284 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:388,-344,572,-276 + extent:412,-344,596,-276 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"con_content" - visible:1632,750,2272,1250 + visible:1248,854,1928,1354 xscroll:0 yscroll:0 next:wimp_TOP @@ -3313,21 +3341,21 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-500,640,0 + extent:0,-500,680,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:640 + xmin:656 ymin:452 - text_only:"Inhoud" + text_only:"Browsen" wimp_icon { - extent:16,-272,624,-24 + extent:16,-272,660,-24 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.size:1 text.validation:"R4" } wimp_icon { @@ -3336,119 +3364,115 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:" Inhoud blokkeren " + text_and_sprite.text:" Paginaverwerking " text_and_sprite.size:29 text_and_sprite.validation:"" } wimp_icon { - extent:32,-100,392,-56 + extent:32,-100,460,-56 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:"Verberg advertenties" + text_and_sprite.text:"Advertenties verbergen" text_and_sprite.size:39 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:32,-152,440,-108 + extent:32,-152,592,-108 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:"Stop pop-up windows" + text_and_sprite.text:"Pop-up vensters verhinderen" text_and_sprite.size:46 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:32,-256,344,-212 -#ifdef WITH_PLUGIN - icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO -#else + extent:32,-256,540,-212 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 - text_and_sprite.text:"Stop plug-ins" + text_and_sprite.text:"Plug-ins uitschakelen" text_and_sprite.size:42 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:16,-380,624,-288 + extent:16,-384,660,-292 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-316,492,-272 + extent:32,-320,492,-276 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:" Link doelen " + text_and_sprite.text:" Koppelingen " text_and_sprite.size:29 text_and_sprite.validation:"" } wimp_icon { - extent:32,-364,636,-320 + extent:32,-368,644,-324 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:"Links mogen nieuw venster openen" - text_and_sprite.size:* + text_and_sprite.text:"In nieuw venster openen toestaan" + text_and_sprite.size:36 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-464,188,-412 + extent:24,-468,200,-416 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:256,-464,420,-412 + extent:296,-468,460,-416 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:436,-472,620,-404 + extent:476,-476,660,-408 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } wimp_icon { - extent:32,-204,376,-160 + extent:32,-204,532,-160 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:"Disable JavaScript" - text_and_sprite.size:19 + text_and_sprite.text:"JavaScript uitschakelen" + text_and_sprite.size:24 text_and_sprite.validation:"Soptoff,opton" } } wimp_window { template_name:"con_connect" - visible:232,442,892,1110 + visible:1328,566,2068,1234 xscroll:0 yscroll:0 next:wimp_TOP @@ -3461,73 +3485,73 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-668,660,0 + extent:0,-668,740,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED work_flags: sprite_area:&1 - xmin:660 + xmin:740 ymin:668 - text_only:"Connectie" + text_only:"Verbinding" wimp_icon { - extent:16,-304,644,-24 + extent:16,-304,724,-24 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.size:1 text.validation:"R4" } wimp_icon { - extent:28,-52,264,-8 + extent:28,-52,232,-8 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:" HTTP Proxy " + text_and_sprite.text:" HTTP-proxy " text_and_sprite.size:15 text_and_sprite.validation:"" } wimp_icon { - extent:12,-104,184,-60 + extent:96,-104,268,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Proxy type" + text_only:"Proxytype" } wimp_icon { - extent:188,-108,572,-56 + extent:272,-108,652,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:32 text.validation:"R2" } wimp_icon { - extent:580,-104,624,-60 + extent:660,-104,704,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:108,-164,184,-120 + extent:156,-164,268,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Host" - text.size:* + text.text:"Server" + text.size:7 text.validation:"" } wimp_icon { - extent:188,-168,504,-116 + extent:272,-168,584,-116 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3537,17 +3561,17 @@ wimp_window { text.validation:"Pptr_write;Kta" } wimp_icon { - extent:500,-164,528,-120 + extent:580,-164,608,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_HCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:":" - text.size:* + text.size:2 text.validation:"" } wimp_icon { - extent:524,-168,628,-116 + extent:604,-168,708,-116 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3557,17 +3581,17 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:36,-224,184,-180 + extent:12,-224,268,-180 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Gebruikernaam" - text.size:* + text.text:"Gebruikersnaam" + text.size:15 text.validation:"" } wimp_icon { - extent:188,-228,628,-176 + extent:272,-228,708,-176 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3577,17 +3601,17 @@ wimp_window { text.validation:"Pptr_write;Kta" } wimp_icon { - extent:36,-284,184,-240 + extent:44,-284,268,-240 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Wachtwoord" - text.size:* + text.size:11 text.validation:"" } wimp_icon { - extent:188,-288,628,-236 + extent:272,-288,708,-236 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3597,77 +3621,77 @@ wimp_window { text.validation:"Pptr_write;Kta;D*" } wimp_icon { - extent:16,-552,644,-332 + extent:16,-552,724,-332 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-360,268,-316 + extent:32,-360,332,-316 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:" Fetching " - text_and_sprite.size:15 + text_and_sprite.text:" Ophaalopdrachten " + text_and_sprite.size:19 text_and_sprite.validation:"" } wimp_icon { - extent:68,-412,320,-368 + extent:148,-412,408,-368 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Maximum fetches" - text.size:* + text.text:"Maximum aantal" + text.size:15 text.validation:"" } wimp_icon { - extent:324,-416,532,-364 + extent:412,-416,620,-364 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"99" - text.size:* + text.size:3 text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:548,-408,580,-376 + extent:636,-408,668,-376 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:580,-408,612,-376 + extent:668,-408,700,-376 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:36,-472,320,-428 + extent:116,-472,408,-428 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Fetches per host" + text.text:"Aantal per server" text.size:18 text.validation:"" } wimp_icon { - extent:324,-476,532,-424 + extent:412,-476,620,-424 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3677,37 +3701,37 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:548,-468,584,-436 + extent:636,-468,672,-436 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:580,-468,612,-436 + extent:668,-468,700,-436 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:20,-532,320,-488 + extent:24,-532,408,-488 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Cached connections" - text.size:* + text.text:"Gebufferde verbindingen" + text.size:24 text.validation:"" } wimp_icon { - extent:324,-536,532,-484 + extent:412,-536,620,-484 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3717,60 +3741,60 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:548,-528,584,-496 + extent:636,-528,672,-496 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:580,-528,612,-496 + extent:668,-528,700,-496 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:24,-640,188,-588 + extent:24,-640,200,-588 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:276,-640,440,-588 + extent:360,-640,524,-588 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:456,-648,640,-580 + extent:540,-648,724,-580 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"sslcert" - visible:348,306,1136,898 + visible:348,250,1136,898 xscroll:0 yscroll:0 next:wimp_TOP @@ -3783,63 +3807,63 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-592,788,0 + extent:0,-648,788,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:788 - ymin:592 - text.text:"SSL certificaat probleem" - text.size:* + ymin:648 + text.text:"SSL-certificaatprobleem" + text.size:24 text.validation:"" wimp_icon { - extent:16,-108,772,-16 + extent:16,-148,772,-16 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"NetSurf kan de authenticiteit van een SSL certificate niet verifieren. Verifieert u alstublieft de details hieronder." + text.text:"NetSurf kan de rechtmatigheid van een SSL-certificaat niet verifi�ren. Verifieer de details hieronder." text.size:150 text.validation:"R2;L" } wimp_icon { - extent:16,-484,772,-136 + extent:16,-548,772,-176 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-164,380,-120 + extent:32,-204,380,-160 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:" Certificaat keten " + text_and_sprite.text:" Certificaatketen " text_and_sprite.size:22 text_and_sprite.validation:"" } wimp_icon { - extent:404,-564,568,-512 + extent:404,-624,568,-572 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verwerpen" - text.size:* + text.text:"Verwerp" + text.size:8 text.validation:"R5,3" } wimp_icon { - extent:588,-572,772,-504 + extent:588,-632,772,-564 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Accepteren" - text.size:* + text.text:"Accepteer" + text.size:10 text.validation:"R6,3" } } ----------------------------------------------------------------------- Summary of changes: riscos/distribution/LeesMij | 73 +++ riscos/templates/nl | 1290 ++++++++++++++++++++++--------------------- 2 files changed, 730 insertions(+), 633 deletions(-) create mode 100644 riscos/distribution/LeesMij diff --git a/riscos/distribution/LeesMij b/riscos/distribution/LeesMij new file mode 100644 index 0000000..a0d3ff4 --- /dev/null +++ b/riscos/distribution/LeesMij @@ -0,0 +1,73 @@ +NetSurf +======= + +Dit is een ontwikkelversie van NetSurf, een webbrowser met open +broncode. + +De nieuwste versie van NetSurf is verkrijgbaar via: + + http://www.netsurf-browser.org/ + + +Installatie +----------- + +De installatie gaat in drie stappen: + + 1. Gebruik de samenvoegfaciliteit van !Boot (te openen via de + besturingssysteeminstellingen -> !Boot) om de meegeleverde + !Boot-map samen te voegen met die van het systeem. + + Als het besturingssysteem geen !Boot-samenvoegfaciliteit + ondersteund, sleep dan de meegeleverde !Boot-map in de map + waarin de bestaande !Boot-structuur staat. + + 2. Gebruik de samenvoegfaciliteit van !System (te openen via de + besturingssysteeminstellingen -> !System) om de meegeleverde + !System-map samen te voegen met die van het systeem. + + 3. Sleep de !NetSurf-programmamap naar de gewenste map op de + harde schijf. + +Dubbelklik op het programma !NetSurf in de gekozen locatie om de +NetSurf-browser te starten. + + +Opmerking NetSurf vereist de WindowManager-module 3.80 of een + recentere versie. Deze is standaard aanwezig in RISC OS 4 + of een recentere versie. Voor RISC OS 3-gebruikers zijn + er twee mogelijkheden om NetSurf te kunnen gebruiken: + + - De 'Universal !Boot Sequence' van Acorn: + http://www.riscos.com/ftp_space/generic/uniboot/ + - HardDisc4-schijfstructuur van RISC OS Open: + https://www.riscosopen.org/content/downloads/common/ + + +Opmerking RISC OS 3.1 of oudere versies worden niet ondersteund. + + +Licenties +--------- + +NetSurf wordt geleverd onder de GPL, evenals verschillende andere +licenties voor de verschillende componenten die het programma +gebruikt. Bezoek in de NetSurf-browser het URL-adres 'about:licence' +voor meer informatie. + + +De meegeleverde !Boot- en !System-mappen bevatten items die door +derden zijn geproduceerd. De bijbehorende licenties zijn meegeleverd +in de map '3rdParty'. + +AcornURI + http://sudden.recoil.org/others/ + +Iconv + http://www.netsurf-browser.org/iconv/ + +SharedUnixLibrary + http://www.riscos.info/downloads/gccsdk/sharedunixlib/system.zip + +Tinct + http://www.tinct.net/tinct.asp diff --git a/riscos/templates/nl b/riscos/templates/nl index adef821..ab51d0d 100644 --- a/riscos/templates/nl +++ b/riscos/templates/nl @@ -21,8 +21,8 @@ wimp_window { sprite_area:&1 xmin:4 ymin:160 - text.text:"NetSurf configuration" - text.size:* + text.text:"NetSurf-instellingen" + text.size:22 text.validation:"" } @@ -47,7 +47,7 @@ wimp_window { sprite_area:&1 xmin:588 ymin:240 - text_only:"Voorraad" + text_only:"Buffer" wimp_icon { extent:16,-124,568,-24 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED @@ -55,62 +55,62 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { - extent:32,-52,268,-8 + extent:32,-52,300,-8 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:" Geheugen " - text_and_sprite.size:* + text_and_sprite.text:" Geheugenbuffer " + text_and_sprite.size:17 text_and_sprite.validation:"" } wimp_icon { - extent:40,-104,164,-60 + extent:60,-104,212,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Omvang" + text.text:"Grootte" text.size:13 text.validation:"" } wimp_icon { - extent:168,-108,336,-56 + extent:216,-108,380,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"512.0" text.size:10 - text.validation:"Pptr_write;Kta" + text.validation:"Pptr_write;Kta;A0-9." } wimp_icon { - extent:352,-100,384,-68 + extent:392,-100,424,-68 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:384,-100,416,-68 + extent:424,-100,456,-68 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:424,-104,480,-60 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED + extent:464,-104,528,-60 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY @@ -123,7 +123,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { @@ -132,22 +132,22 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:" Disc cache " - text_and_sprite.size:* + text_and_sprite.text:" Schijfbuffer " + text_and_sprite.size:15 text_and_sprite.validation:"" } wimp_icon { - extent:40,-232,164,-188 + extent:60,-232,212,-188 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Omvang" + text.text:"Grootte" text.size:13 text.validation:"" } wimp_icon { - extent:168,-236,336,-184 + extent:216,-236,380,-184 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -157,45 +157,45 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:352,-228,384,-196 + extent:392,-228,424,-196 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:384,-228,416,-196 + extent:424,-228,456,-196 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:424,-232,480,-192 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED + extent:464,-232,528,-192 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_only:"MB" } wimp_icon { - extent:44,-292,164,-248 + extent:12,-292,212,-248 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Expiry" - text.size:13 + text.text:"Bewaar max." + text.size:12 text.validation:"" } wimp_icon { - extent:168,-296,336,-244 + extent:216,-296,380,-244 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -205,68 +205,68 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:352,-288,384,-256 + extent:392,-288,424,-256 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:384,-288,416,-256 + extent:424,-288,456,-256 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:424,-292,500,-252 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED + extent:464,-292,560,-252 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"days" + text_only:"dagen" } wimp_icon { - extent:24,-396,188,-344 + extent:24,-396,200,-344 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:204,-396,368,-344 + extent:216,-396,376,-344 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:384,-404,568,-336 + extent:392,-404,568,-336 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"con_fonts" - visible:558,802,1270,1526 + visible:558,802,1282,1526 xscroll:0 yscroll:0 next:wimp_TOP @@ -279,91 +279,91 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-724,712,0 + extent:0,-724,724,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED work_flags: sprite_area:&1 xmin:712 ymin:724 - text_only:"Lettertypes" + text_only:"Lettertypen" wimp_icon { - extent:16,-424,696,-28 + extent:16,-424,704,-28 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-52,236,-8 + extent:32,-52,256,-8 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:" Font beeld " - text_and_sprite.size:* + text_and_sprite.text:" Lettertypen " + text_and_sprite.size:14 text_and_sprite.validation:"" } wimp_icon { - extent:20,-104,192,-60 + extent:24,-104,216,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Sans-serif" + text_only:"Schreefloos" } wimp_icon { - extent:196,-108,620,-56 + extent:220,-108,628,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-104,676,-60 + extent:640,-104,684,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:100,-164,192,-120 + extent:24,-164,216,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Serif" + text_only:"Met schreef" } wimp_icon { - extent:196,-168,620,-116 + extent:220,-168,628,-116 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-164,676,-120 + extent:640,-164,684,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:28,-224,192,-180 + extent:36,-224,216,-180 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -371,17 +371,17 @@ wimp_window { text_only:"Monospace" } wimp_icon { - extent:196,-228,620,-176 + extent:220,-228,628,-176 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-224,676,-180 + extent:640,-224,684,-180 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -391,149 +391,149 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:68,-284,192,-240 + extent:88,-284,216,-240 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Cursive" + text_only:"Cursief" } wimp_icon { - extent:196,-288,620,-236 + extent:220,-288,628,-236 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-284,676,-240 + extent:640,-284,684,-240 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:68,-344,192,-300 + extent:72,-344,216,-300 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Fantasy" + text_only:"Fantasie" } wimp_icon { - extent:196,-348,620,-296 + extent:220,-348,628,-296 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-344,676,-300 + extent:640,-344,684,-300 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:68,-404,192,-360 + extent:56,-404,216,-360 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Verstek" + text_only:"Standaard" } wimp_icon { - extent:196,-408,620,-356 + extent:220,-408,628,-356 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:256 text.validation:"R2" } wimp_icon { - extent:632,-404,676,-360 + extent:640,-404,684,-360 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:16,-612,696,-452 + extent:16,-612,704,-452 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-480,220,-436 + extent:32,-480,296,-436 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:" Font omvang " - text_and_sprite.size:* + text_and_sprite.text:" Lettergrootte " + text_and_sprite.size:16 text_and_sprite.validation:"" } wimp_icon { - extent:68,-532,192,-488 + extent:32,-532,200,-488 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Verstek" + text_only:"Standaard" } wimp_icon { - extent:196,-536,364,-484 + extent:204,-536,372,-484 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"12.3" text.size:10 - text.validation:"Pptr_write;Kta" + text.validation:"Pptr_write;Kta;A0-9." } wimp_icon { - extent:380,-528,412,-496 + extent:388,-528,420,-496 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:412,-528,444,-496 + extent:420,-528,452,-496 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:452,-532,492,-488 + extent:460,-532,500,-488 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -541,7 +541,7 @@ wimp_window { text_only:"pt" } wimp_icon { - extent:60,-592,192,-548 + extent:52,-592,200,-548 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -549,37 +549,37 @@ wimp_window { text_only:"Minimum" } wimp_icon { - extent:196,-596,364,-544 + extent:204,-596,372,-544 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"12.3" text.size:10 - text.validation:"Pptr_write;Kta" + text.validation:"Pptr_write;Kta;A0-9." } wimp_icon { - extent:380,-588,412,-556 + extent:388,-588,420,-556 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:412,-588,444,-556 + extent:420,-588,452,-556 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:452,-592,492,-548 + extent:460,-592,500,-548 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -587,40 +587,40 @@ wimp_window { text_only:"pt" } wimp_icon { - extent:24,-696,188,-644 + extent:24,-696,200,-644 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:332,-696,496,-644 + extent:340,-696,504,-644 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:512,-704,696,-636 + extent:520,-704,704,-636 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"con_home" - visible:284,152,1084,448 + visible:808,592,1608,888 xscroll:0 yscroll:0 next:wimp_TOP @@ -647,7 +647,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { @@ -661,12 +661,12 @@ wimp_window { text_and_sprite.validation:"" } wimp_icon { - extent:48,-108,120,-64 + extent:24,-108,120,-64 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"URL" + text_only:"Adres" } wimp_icon { extent:124,-112,712,-60 @@ -689,23 +689,23 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:124,-164,676,-120 + extent:124,-164,732,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_SELECTED | wimp_BUTTON_RADIO icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:"Open nieuwe pagina tijdens starten" - text_and_sprite.size:* + text_and_sprite.text:"Browservenster openen na opstarten" + text_and_sprite.size:35 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-264,188,-212 + extent:24,-264,200,-212 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { @@ -715,7 +715,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -724,15 +724,15 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"con_image" - visible:828,926,1504,1514 + visible:1488,822,2164,1410 xscroll:0 yscroll:0 next:wimp_TOP @@ -746,12 +746,14 @@ wimp_window { highlight_bg:wimp_COLOUR_CREAM extra_flags: extent:0,-588,676,0 - title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED + title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED work_flags: sprite_area:&1 xmin:676 ymin:588 - text_only:"Beelden" + text.text:"Afbeeldingen" + text.size:13 + text.validation:"" wimp_icon { extent:16,-292,660,-24 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED @@ -759,21 +761,21 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { - extent:32,-52,284,-8 + extent:32,-52,396,-8 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:" Beeld kwaliteit " - text_and_sprite.size:* + text_and_sprite.text:" Afbeeldingskwaliteit " + text_and_sprite.size:23 text_and_sprite.validation:"" } wimp_icon { - extent:32,-108,204,-64 + extent:40,-108,216,-64 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -781,12 +783,12 @@ wimp_window { text_only:"Voorgrond" } wimp_icon { - extent:208,-112,592,-60 + extent:220,-112,592,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Error diffused" + text.text:"RISC OS-routines" text.size:256 text.validation:"R2" } @@ -801,7 +803,7 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:32,-168,204,-124 + extent:24,-168,216,-124 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -809,12 +811,12 @@ wimp_window { text_only:"Achtergrond" } wimp_icon { - extent:208,-172,592,-120 + extent:220,-172,592,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Error diffused" + text.text:"RISC OS-routines" text.size:256 text.validation:"R2" } @@ -842,11 +844,11 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { - extent:32,-348,284,-304 + extent:32,-348,236,-304 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -856,73 +858,73 @@ wimp_window { text_and_sprite.validation:"" } wimp_icon { - extent:20,-404,208,-360 + extent:20,-404,232,-360 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Snelheid limiet" - text.size:* + text.text:"Animatietijd" + text.size:15 text.validation:"" } wimp_icon { - extent:212,-408,380,-356 + extent:236,-408,404,-356 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"12.34" - text.size:* - text.validation:"Pptr_write;Kta" + text.size:6 + text.validation:"Pptr_write;Kta;A0-9." } wimp_icon { - extent:396,-400,428,-368 + extent:420,-400,452,-368 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:428,-400,460,-368 + extent:452,-400,484,-368 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:468,-404,592,-360 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED + extent:492,-404,644,-360 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"secondes" - text.size:* + text.text:"seconden" + text.size:9 text.validation:"" } wimp_icon { - extent:212,-460,556,-416 + extent:236,-460,616,-416 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:"Animaties uitzetten" - text_and_sprite.size:* + text_and_sprite.size:20 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-560,188,-508 + extent:24,-560,200,-508 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { @@ -932,7 +934,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -941,15 +943,15 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"con_inter" - visible:1212,692,1956,1472 + visible:2320,436,3164,1220 xscroll:0 yscroll:0 next:wimp_TOP @@ -962,61 +964,63 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-780,744,0 - title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | 0x27000000 + extent:0,-784,844,0 + title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:744 ymin:584 - text_only:"Interface" + text.text:"Gebruikersinterface" + text.size:20 + text.validation:"" wimp_icon { - extent:16,-168,728,-24 + extent:16,-168,820,-24 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-52,492,-8 + extent:32,-52,576,-8 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:" Ophalen / Opslaan van bestanden " - text_and_sprite.size:* + text_and_sprite.text:" Ophalen / opslaan van bestanden " + text_and_sprite.size:34 text_and_sprite.validation:"" } wimp_icon { - extent:32,-100,656,-56 + extent:32,-100,748,-56 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:"Bestand opslaan zonder extensie" - text_and_sprite.size:39 + text_and_sprite.text:"Bestand opslaan zonder bestandsextensie" + text_and_sprite.size:40 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:32,-152,676,-108 + extent:32,-152,808,-108 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:"Vraag toestemming voor bestand overschrijven" - text_and_sprite.size:* + text_and_sprite.text:"Toestemming vragen bij overschrijven" + text_and_sprite.size:37 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:16,-344,728,-200 + extent:16,-344,820,-200 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.size:1 text.validation:"R4" } wimp_icon { @@ -1026,37 +1030,37 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:" Interactieve kenmerken " - text_and_sprite.size:* + text_and_sprite.size:25 text_and_sprite.validation:"" } wimp_icon { - extent:32,-276,744,-232 + extent:32,-276,804,-232 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:"Toon recent bezochte URLs tijdens typen" - text_and_sprite.size:* + text_and_sprite.text:"Recent bezochte adressen tonen tijdens typen" + text_and_sprite.size:45 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:32,-328,872,-284 + extent:32,-328,776,-284 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:"Hover URLs by the pointer for local history" - text_and_sprite.size:* + text_and_sprite.text:"Adressen tonen bij de venstergeschiedenis" + text_and_sprite.size:42 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:16,-468,728,-372 + extent:16,-468,820,-372 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.size:1 text.validation:"R4" } wimp_icon { @@ -1065,58 +1069,58 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:" Duimnagels " + text_and_sprite.text:" Miniaturen " text_and_sprite.size:23 text_and_sprite.validation:"" } wimp_icon { - extent:32,-452,648,-408 + extent:32,-452,708,-408 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:"Gebruik duimnagels voor icoon-vensters" + text_and_sprite.text:"Miniaturen gebruiken bij symboliseren" text_and_sprite.size:42 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-748,188,-696 + extent:24,-748,200,-696 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:360,-748,524,-696 + extent:456,-748,620,-696 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:540,-756,724,-688 + extent:636,-756,820,-688 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } wimp_icon { - extent:16,-664,728,-496 + extent:16,-664,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.size:1 text.validation:"R4" } wimp_icon { @@ -1125,7 +1129,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:"Hotlist" + text_and_sprite.text:"Favorieten" text_and_sprite.size:23 text_and_sprite.validation:"" } @@ -1135,27 +1139,27 @@ wimp_window { 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.text:"Extern programma voor favorietenlijst" + text_and_sprite.size:38 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:28,-640,232,-588 + extent:24,-644,256,-592 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Hotlist path" - text.size:* + text.text:"Programmapad" + text.size:13 text.validation:"" } wimp_icon { - extent:232,-640,708,-588 + extent:260,-644,800,-592 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE - text.text:"Writable icon" + text.text:"Schrijfbaar veld" text.size:256 text.validation:"Pptr_write;Kta" } @@ -1163,7 +1167,7 @@ wimp_window { wimp_window { template_name:"con_lang" - visible:170,956,914,1256 + visible:1574,956,2318,1256 xscroll:0 yscroll:0 next:wimp_TOP @@ -1190,7 +1194,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { @@ -1204,15 +1208,15 @@ wimp_window { text_and_sprite.validation:"" } wimp_icon { - extent:48,-108,204,-64 + extent:64,-108,224,-64 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Programma" + text_only:"Interface" } wimp_icon { - extent:208,-112,660,-60 + extent:228,-112,660,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1232,17 +1236,15 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:40,-168,204,-124 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED + extent:32,-168,224,-124 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Web pagina's" - text.size:* - text.validation:"" + text_only:"Webpagina's" } wimp_icon { - extent:208,-172,660,-120 + extent:228,-172,660,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1262,13 +1264,13 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:24,-272,188,-220 + extent:24,-272,200,-220 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { @@ -1278,7 +1280,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -1287,8 +1289,8 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } @@ -1322,27 +1324,27 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R4" } wimp_icon { - extent:32,-52,332,-8 + extent:32,-52,392,-8 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:" Beschikbare thema's " - text_and_sprite.size:* + text_and_sprite.size:22 text_and_sprite.validation:"" } wimp_icon { - extent:24,-576,188,-524 + extent:24,-576,200,-524 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { @@ -1352,7 +1354,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -1361,15 +1363,15 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"download" - visible:486,610,1282,890 + visible:486,610,1394,890 xscroll:0 yscroll:0 next:wimp_TOP @@ -1382,63 +1384,63 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-280,796,0 + extent:0,-280,908,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 - xmin:80 + xmin:88 ymin:28 - text.text:"NetSurf ophaalproces" - text.size:* + text.text:"NetSurf-ophaalproces" + text.size:21 text.validation:"" wimp_icon { - extent:364,-84,432,-16 + extent:420,-84,488,-16 icon_flags:wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY sprite.id:"file_ddc" - sprite.size:* + sprite.size:9 sprite.area:&1 } wimp_icon { - extent:204,-152,788,-100 + extent:204,-152,900,-100 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"http://netsurf.sourceforge.net/netsurf.zip" - text.size:* + text.size:43 text.validation:"R2" } wimp_icon { - extent:204,-212,788,-160 + extent:204,-212,900,-160 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"netsurf" - text.size:* + text.size:8 text.validation:"Pptr_write" } wimp_icon { - extent:204,-212,788,-160 + extent:204,-212,900,-160 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"ADFS::A7000+.$.netsurf" - text.size:* + text.size:23 text.validation:"R2" } wimp_icon { - extent:8,-272,788,-220 + extent:8,-272,900,-220 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { @@ -1449,13 +1451,13 @@ wimp_window { icon_bg:wimp_COLOUR_CREAM } wimp_icon { - extent:12,-268,784,-224 + extent:12,-268,896,-224 icon_flags:wimp_ICON_TEXT | 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:"84.4KB of 1.1MB � 26.6KB/s � 0:39 remaining" - text.size:* + text.text:"999 KB compleet � gemiddeld 926.6 KB/s � 0:39 resterend" + text.size:72 text.validation:"" } wimp_icon { @@ -1497,14 +1499,14 @@ wimp_window { sprite_area:&1 xmin:0 ymin:0 - text.text:"History" - text.size:* + text.text:" Venstergeschiedenis " + text.size:22 text.validation:"" } wimp_window { template_name:"info" - visible:752,452,1372,700 + visible:752,324,1412,700 xscroll:0 yscroll:0 next:wimp_TOP @@ -1517,14 +1519,14 @@ wimp_window { scroll_inner:wimp_COLOUR_ORANGE highlight_bg:wimp_COLOUR_LIGHT_GREY extra_flags: - extent:0,-248,620,0 + extent:0,-376,660,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED work_flags:wimp_BUTTON_CLICK sprite_area:&1 - xmin:620 + xmin:660 ymin:248 - text.text:"Over dit programma" - text.size:* + text.text:"Programma-informatie" + text.size:21 text.validation:"" wimp_icon { extent:672,-200,848,-152 @@ -1535,47 +1537,47 @@ wimp_window { text_only:"OK" } wimp_icon { - extent:152,-60,612,-8 + extent:168,-60,652,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"NetSurf" - text.size:* + text.size:8 text.validation:"R2" } wimp_icon { - extent:152,-120,612,-68 + extent:168,-120,652,-68 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Open broncode web browser" - text.size:* + text.text:"Webbrowser met open broncode" + text.size:29 text.validation:"R2" } wimp_icon { - extent:152,-180,612,-128 + extent:168,-180,652,-128 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"� NetSurf developers" + text.text:"� NetSurf-ontwikkelaars" text.size:40 text.validation:"R2" } wimp_icon { - extent:152,-240,612,-188 + extent:168,-368,652,-316 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"CVS test build" + text.text:"CVS-testuitgave" text.size:40 text.validation:"R2" } wimp_icon { - extent:60,-56,148,-12 + extent:72,-56,164,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1583,7 +1585,7 @@ wimp_window { text_only:"Naam" } wimp_icon { - extent:24,-116,148,-72 + extent:40,-116,164,-72 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1591,7 +1593,7 @@ wimp_window { text_only:"Functie" } wimp_icon { - extent:24,-176,148,-132 + extent:40,-176,164,-132 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1599,18 +1601,38 @@ wimp_window { text_only:"Auteurs" } wimp_icon { - extent:24,-236,148,-192 + extent:40,-364,164,-320 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_only:"Versie" } + wimp_icon { + extent:168,-308,652,-188 + icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"G. van Katwijk & D. Tanis g.vankatwijk(a)freeler.nl" + text.size:50 + text.validation:"R2;L" + } + wimp_icon { + extent:0,-304,164,-192 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"Vertaling & contact" + text.size:20 + text.validation:"L" + } } wimp_window { template_name:"login" - visible:582,400,1258,736 + visible:582,400,1322,736 xscroll:0 yscroll:0 next:wimp_TOP @@ -1623,37 +1645,37 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-336,676,0 + extent:0,-336,740,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 - xmin:676 + xmin:740 ymin:336 - text.text:"Authentificeren" - text.size:* + text.text:"Website-authenticatie" + text.size:22 text.validation:"" wimp_icon { - extent:532,-324,664,-256 + extent:596,-324,728,-256 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Aanmelden" - text.size:* + text.text:"Login" + text.size:8 text.validation:"R6,3;Nok" } wimp_icon { - extent:380,-316,508,-264 + extent:408,-316,572,-264 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3;Ncancel" } wimp_icon { - extent:168,-60,668,-8 + extent:252,-60,732,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1663,7 +1685,7 @@ wimp_window { text.validation:"R2" } wimp_icon { - extent:168,-120,668,-68 + extent:252,-120,732,-68 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1673,7 +1695,7 @@ wimp_window { text.validation:"R2" } wimp_icon { - extent:168,-180,668,-128 + extent:252,-180,732,-128 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1683,7 +1705,7 @@ wimp_window { text.validation:"Pptr_write;Kta;N401username" } wimp_icon { - extent:168,-240,668,-188 + extent:252,-240,732,-188 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1693,25 +1715,25 @@ wimp_window { text.validation:"Pptr_write;Kta;D*" } wimp_icon { - extent:88,-56,164,-12 + extent:100,-56,248,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Host" + text_only:"Website" } wimp_icon { - extent:16,-176,164,-132 + extent:4,-176,248,-132 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Gebruikernaam" - text.size:* + text.text:"Gebruikersnaam" + text.size:15 text.validation:"" } wimp_icon { - extent:24,-236,164,-192 + extent:16,-236,248,-192 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1719,7 +1741,7 @@ wimp_window { text_only:"Wachtwoord" } wimp_icon { - extent:68,-116,164,-72 + extent:108,-116,248,-72 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -1776,7 +1798,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"URL" + text_only:"Adres" } wimp_icon { extent:112,-120,532,-68 @@ -1789,13 +1811,13 @@ wimp_window { text.validation:"Pptr_write;Kta" } wimp_icon { - extent:304,-200,432,-148 + extent:268,-200,432,-148 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -1863,13 +1885,13 @@ wimp_window { text.validation:"Pptr_write;Kta" } wimp_icon { - extent:304,-140,432,-88 + extent:268,-140,432,-88 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -1905,7 +1927,7 @@ wimp_window { sprite_area:&1 xmin:788 ymin:188 - text.text:"Over dit object" + text.text:"Objectinformatie" text.size:20 text.validation:"" wimp_icon { @@ -1914,7 +1936,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -1924,7 +1946,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -1934,7 +1956,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -1945,7 +1967,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY sprite.id:"file_faf" - sprite.size:* + sprite.size:9 sprite.area:&1 } wimp_icon { @@ -1965,12 +1987,12 @@ wimp_window { text_only:"Type" } wimp_icon { - extent:128,-56,200,-12 + extent:104,-56,200,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"URL" + text_only:"Adres" } } @@ -1990,22 +2012,24 @@ wimp_window { highlight_bg:wimp_COLOUR_CREAM extra_flags: extent:0,-156,800,0 - title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | 0x27000000 + title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:0 ymin:0 - text_only:"Open URL" + text.text:"Weblocatie openen" + text.size:18 + text.validation:"" wimp_icon { - extent:20,-56,92,-12 + extent:8,-56,104,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"URL" + text_only:"Adres" } wimp_icon { - extent:96,-60,736,-8 + extent:108,-60,736,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2015,13 +2039,13 @@ wimp_window { text.validation:"Pptr_write;Kta" } wimp_icon { - extent:504,-136,632,-84 + extent:468,-136,632,-84 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -2067,8 +2091,8 @@ wimp_window { sprite_area:&1 xmin:792 ymin:248 - text.text:"Over dit document" - text.size:* + text.text:"Documentinfo" + text.size:13 text.validation:"" wimp_icon { extent:208,-60,784,-8 @@ -2076,7 +2100,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -2086,7 +2110,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -2096,7 +2120,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -2106,7 +2130,7 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:64 text.validation:"R2" } @@ -2117,19 +2141,19 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY sprite.id:"file_faf" - sprite.size:* + sprite.size:9 sprite.area:&1 } wimp_icon { - extent:132,-116,204,-72 + extent:108,-116,204,-72 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"URL" + text_only:"Adres" } wimp_icon { - extent:64,-176,204,-132 + extent:60,-176,204,-132 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2137,7 +2161,7 @@ wimp_window { text_only:"Codering" } wimp_icon { - extent:124,-236,204,-192 + extent:116,-236,204,-192 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2156,7 +2180,7 @@ wimp_window { wimp_window { template_name:"print" - visible:472,136,1072,708 + visible:472,136,1132,708 xscroll:0 yscroll:0 next:wimp_TOP @@ -2169,23 +2193,23 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-572,600,0 + extent:0,-572,700,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:600 ymin:572 - text.text:"Geen afdrukker" - text.size:20 + text.text:"Geen stuurprogramma aanwezig" + text.size:29 text.validation:"" wimp_icon { - extent:12,-176,588,-24 + extent:12,-176,652,-24 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.size:1 text.validation:"R4" } wimp_icon { @@ -2195,7 +2219,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"einde van de webpagina" - text_and_sprite.size:* + text_and_sprite.size:23 text_and_sprite.validation:"Sradiooff,radioon" } wimp_icon { @@ -2225,7 +2249,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { @@ -2235,7 +2259,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { @@ -2245,37 +2269,37 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"pagina('s)" - text.size:* + text.size:11 text.validation:"" } wimp_icon { - extent:12,-236,420,-192 + extent:12,-236,512,-192 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:"Toon voorgrondafbeeldingen" - text_and_sprite.size:* + text_and_sprite.text:"Voorgrondafbeeldingen" + text_and_sprite.size:22 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:12,-288,420,-244 + extent:12,-288,528,-244 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:"Toon achtergrondafbeeldingen" - text_and_sprite.size:* + text_and_sprite.text:"Achtergrondafbeeldingen" + text_and_sprite.size:24 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:12,-340,372,-296 + extent:12,-340,492,-296 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:"In de achtergrond afdrukken" - text_and_sprite.size:* + text_and_sprite.text:"Afdrukken in achtergrond" + text_and_sprite.size:25 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { @@ -2285,7 +2309,7 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"Staand" - text_and_sprite.size:* + text_and_sprite.size:7 text_and_sprite.validation:"Sradiooff,radioon" } wimp_icon { @@ -2295,11 +2319,11 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"Liggend" - text_and_sprite.size:* + text_and_sprite.size:8 text_and_sprite.validation:"Sradiooff,radioon" } wimp_icon { - extent:432,-456,512,-404 + extent:480,-456,560,-404 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2309,47 +2333,47 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:524,-448,556,-416 + extent:572,-448,604,-416 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:556,-448,588,-416 + extent:604,-448,636,-416 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:304,-552,432,-500 + extent:292,-552,456,-500 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:456,-560,588,-492 + extent:480,-560,648,-492 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Afdrukkn" - text.size:* + text.text:"Druk af" + text.size:8 text.validation:"R6,3" } wimp_icon { - extent:320,-452,428,-408 + extent:344,-452,476,-408 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2357,40 +2381,40 @@ wimp_window { text_only:"Kopie�n" } wimp_icon { - extent:-16,-480,608,-472 + extent:-16,-480,676,-472 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:32,-48,364,-4 + extent:32,-48,448,-4 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:" Stop afdrukken na " - text_and_sprite.size:* + text_and_sprite.text:" Afdrukken stoppen na " + text_and_sprite.size:23 text_and_sprite.validation:"" } wimp_icon { - extent:252,-400,676,-356 + extent:232,-400,656,-356 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:"Alle tekst in zwart" - text_and_sprite.size:* + text_and_sprite.size:20 text_and_sprite.validation:"Soptoff,opton" } } wimp_window { template_name:"query" - visible:142,562,942,806 + visible:142,526,942,806 xscroll:0 yscroll:0 next:wimp_TOP @@ -2403,7 +2427,7 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_LIGHT_GREY extra_flags: - extent:0,-244,800,0 + extent:0,-280,800,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 @@ -2413,43 +2437,43 @@ wimp_window { text.size:21 text.validation:"" wimp_icon { - extent:92,-148,792,-8 + extent:92,-184,792,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Message" + text.text:"Bericht" text.size:300 text.validation:"R2;L" } wimp_icon { - extent:604,-232,788,-164 + extent:604,-268,788,-200 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"012345678901234567" - text.size:* + text.size:19 text.validation:"R6,3" } wimp_icon { - extent:424,-224,588,-172 + extent:424,-260,588,-208 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"012345678901234567" - text.size:* + text.text:"0123456789012345678901" + text.size:23 text.validation:"R5,3" } wimp_icon { - extent:16,-224,132,-172 + extent:16,-260,132,-208 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Hulp" - text.size:* + text.size:5 text.validation:"R5,3" } wimp_icon { @@ -2464,7 +2488,7 @@ wimp_window { wimp_window { template_name:"saveas" - visible:824,676,1140,924 + visible:824,676,1164,924 xscroll:0 yscroll:0 next:wimp_TOP @@ -2477,7 +2501,7 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-248,316,0 + extent:0,-248,340,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | 0x27000000 work_flags: sprite_area:&1 @@ -2485,7 +2509,7 @@ wimp_window { ymin:244 text_only:"Bewaar als" wimp_icon { - extent:124,-84,192,-16 + extent:144,-84,212,-16 icon_flags:wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_CLICK_DRAG icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2495,7 +2519,7 @@ wimp_window { sprite.area:&1 } wimp_icon { - extent:8,-152,308,-100 + extent:8,-152,332,-100 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2505,30 +2529,30 @@ wimp_window { text.validation:"Pptr_write" } wimp_icon { - extent:172,-236,304,-168 + extent:184,-236,332,-168 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Bewaar" - text.size:* + text.size:7 text.validation:"R6,3" } wimp_icon { - extent:20,-228,148,-176 + extent:8,-228,168,-176 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } } wimp_window { template_name:"search" - visible:1036,684,1680,928 + visible:1036,684,1792,928 xscroll:0 yscroll:0 next:wimp_TOP @@ -2541,17 +2565,17 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-244,644,0 + extent:0,-244,756,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 - xmin:644 + xmin:756 ymin:244 text.text:"Tekst zoeken" - text.size:* + text.size:13 text.validation:"" wimp_icon { - extent:96,-60,580,-8 + extent:96,-60,692,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2561,17 +2585,17 @@ wimp_window { text.validation:"KN;Pptr_write" } wimp_icon { - extent:96,-116,352,-72 + extent:96,-116,476,-72 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:"Hoofdletter gevoelig" - text_and_sprite.size:* + text_and_sprite.text:"Hoofdlettergevoelig" + text_and_sprite.size:20 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:500,-228,632,-160 + extent:568,-228,744,-160 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 @@ -2581,43 +2605,43 @@ wimp_window { text.validation:"R6,3" } wimp_icon { - extent:348,-220,484,-168 + extent:424,-220,552,-168 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Vorige" - text.size:* + text.size:7 text.validation:"R5,3" } wimp_icon { - extent:204,-220,332,-168 + extent:248,-220,408,-168 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:16,-216,196,-172 + extent:12,-216,232,-172 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Niet gevonden" - text.size:* + text.size:14 text.validation:"" } wimp_icon { - extent:-8,-148,652,-140 + extent:-8,-148,772,-140 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.size:1 text.validation:"R2" } wimp_icon { @@ -2629,7 +2653,7 @@ wimp_window { text_only:"Zoek" } wimp_icon { - extent:588,-56,632,-12 + extent:700,-56,744,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_ICON_SHADED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2639,20 +2663,20 @@ wimp_window { text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:408,-116,636,-72 + extent:472,-116,748,-72 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:"Toon alles" - text_and_sprite.size:* + text_and_sprite.text:"Alles markeren" + text_and_sprite.size:15 text_and_sprite.validation:"Soptoff,opton" } } wimp_window { template_name:"theme_inst" - visible:374,590,1174,834 + visible:374,554,1174,834 xscroll:0 yscroll:0 next:wimp_TOP @@ -2665,43 +2689,43 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-244,800,0 + extent:0,-280,800,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:800 - ymin:244 - text.text:"NetSurf thema installatie" - text.size:* + ymin:280 + text.text:"NetSurf-thema-intallatie" + text.size:25 text.validation:"" wimp_icon { - extent:92,-148,792,-8 + extent:92,-184,792,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Message" + text.text:"Bericht" text.size:300 text.validation:"R2;L" } wimp_icon { - extent:640,-232,788,-164 + extent:588,-268,788,-200 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Installeer" - text.size:* + text.size:11 text.validation:"R6,3" } wimp_icon { - extent:488,-224,616,-172 + extent:404,-260,564,-208 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { @@ -2735,14 +2759,14 @@ wimp_window { sprite_area:&1 xmin:0 ymin:0 - text_only:"<Untitled>" + text_only:"<Naamloos>" wimp_icon { extent:0,-40,300,4 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Comment" + text.text:"Commentaar" text.size:256 text.validation:"" } @@ -2795,12 +2819,12 @@ wimp_window { sprite_area:&1 xmin:0 ymin:0 - text_only:"<Untitled>" + text_only:"<Naamloos>" } wimp_window { template_name:"warning" - visible:320,850,1120,1094 + visible:320,814,1120,1094 xscroll:0 yscroll:0 next:wimp_TOP @@ -2813,43 +2837,43 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-244,800,0 + extent:0,-280,800,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:0 ymin:0 text.text:"Waarschuwing van NetSurf" - text.size:* + text.size:25 text.validation:"" wimp_icon { - extent:92,-148,792,-8 + extent:92,-184,792,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Message" + text.text:"Bericht" text.size:300 text.validation:"R2;L" } wimp_icon { - extent:608,-232,788,-164 + extent:608,-268,788,-200 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Verder" - text.size:* + text.size:7 text.validation:"R6,3" } wimp_icon { - extent:484,-224,584,-172 + extent:484,-260,584,-208 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Hulp" - text.size:* + text.size:5 text.validation:"R5,3" } wimp_icon { @@ -2864,7 +2888,7 @@ wimp_window { wimp_window { template_name:"zoom" - visible:182,356,630,578 + visible:182,356,650,578 xscroll:0 yscroll:0 next:wimp_TOP @@ -2877,17 +2901,17 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-224,448,0 + extent:0,-224,468,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED work_flags: sprite_area:&1 - xmin:448 + xmin:468 ymin:220 text.text:"Pagina schalen" - text.size:* + text.size:15 text.validation:"" wimp_icon { - extent:8,-56,100,-12 + extent:0,-56,112,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2895,7 +2919,7 @@ wimp_window { text_only:"Schaal" } wimp_icon { - extent:104,-60,204,-8 + extent:116,-60,212,-8 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2905,27 +2929,27 @@ wimp_window { text.validation:"Pptr_write;KTA;A0-9." } wimp_icon { - extent:216,-52,248,-20 + extent:224,-52,256,-20 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sdown,pdown" } wimp_icon { - extent:248,-52,280,-20 + extent:256,-52,288,-20 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sup,pup" } wimp_icon { - extent:284,-56,324,-12 + extent:292,-56,332,-12 icon_flags:wimp_ICON_TEXT | wimp_ICON_HCENTRED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -2933,12 +2957,12 @@ wimp_window { text_only:"%" } wimp_icon { - extent:104,-112,416,-68 + extent:116,-112,460,-68 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:"Schaal alle frames" + text_and_sprite.text:"Frames meeschalen" text_and_sprite.size:20 text_and_sprite.validation:"Soptoff,opton" } @@ -2949,34 +2973,34 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:164,-204,292,-152 + extent:148,-204,308,-152 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:308,-212,440,-144 + extent:324,-212,460,-144 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Schaal" - text.size:* + text.size:7 text.validation:"R6,3" } } wimp_window { template_name:"ssldisplay" - visible:142,60,1102,600 + visible:862,768,1870,1308 xscroll:0 yscroll:0 next:wimp_TOP @@ -2989,23 +3013,23 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-540,960,0 + extent:0,-540,1008,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 - xmin:960 + xmin:1008 ymin:76 - text.text:"SSL certificaat" - text.size:* + text.text:"SSL-certificaat" + text.size:16 text.validation:"" wimp_icon { - extent:16,-520,944,-24 + extent:16,-520,992,-24 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.size:1 text.validation:"R4" } wimp_icon { @@ -3014,12 +3038,12 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:" Certificaat details " - text_and_sprite.size:* + text_and_sprite.text:" Certificaatedetails " + text_and_sprite.size:22 text_and_sprite.validation:"" } wimp_icon { - extent:24,-108,148,-64 + extent:72,-108,196,-64 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3027,37 +3051,37 @@ wimp_window { text_only:"Versie" } wimp_icon { - extent:152,-108,264,-56 + extent:200,-108,312,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:252,-104,424,-60 + extent:320,-104,528,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Geldig vanaf" - text.size:* + text.size:13 text.validation:"" } wimp_icon { - extent:428,-108,928,-56 + extent:532,-108,976,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:68,-168,148,-124 + extent:116,-168,196,-124 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3065,17 +3089,17 @@ wimp_window { text_only:"Type" } wimp_icon { - extent:152,-168,264,-116 + extent:200,-168,312,-116 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:236,-164,424,-120 + extent:340,-164,528,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3083,17 +3107,17 @@ wimp_window { text_only:"Geldig tot" } wimp_icon { - extent:428,-168,928,-116 + extent:532,-168,976,-116 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:40,-228,148,-184 + extent:68,-228,196,-184 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3101,17 +3125,17 @@ wimp_window { text_only:"Serienr" } wimp_icon { - extent:152,-228,928,-176 + extent:200,-228,976,-176 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2" } wimp_icon { - extent:40,-288,148,-244 + extent:56,-288,196,-244 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3119,17 +3143,17 @@ wimp_window { text_only:"Uitgever" } wimp_icon { - extent:152,-376,928,-236 + extent:200,-376,976,-236 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2;L" } wimp_icon { - extent:24,-432,148,-388 + extent:24,-432,196,-388 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3137,20 +3161,20 @@ wimp_window { text_only:"Onderwerp" } wimp_icon { - extent:152,-504,928,-384 + extent:200,-504,976,-384 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"" - text.size:* + text.size:1 text.validation:"R2;L" } } wimp_window { template_name:"con_secure" - visible:514,132,1106,496 + visible:1590,788,2206,1152 xscroll:0 yscroll:0 next:wimp_TOP @@ -3163,21 +3187,23 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-364,592,0 - title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED + extent:0,-364,616,0 + title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED work_flags: sprite_area:&1 - xmin:592 + xmin:616 ymin:364 - text_only:"Veiligheid" + text.text:"Privacy & veiligheid" + text.size:21 + text.validation:"" wimp_icon { - extent:16,-120,576,-24 + extent:16,-120,600,-24 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.size:1 text.validation:"R4" } wimp_icon { @@ -3187,27 +3213,27 @@ wimp_window { icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:" Cross-site privacy " - text_and_sprite.size:* + text_and_sprite.size:21 text_and_sprite.validation:"" } wimp_icon { - extent:32,-104,568,-60 + extent:32,-104,592,-60 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:"Send site referral information" - text_and_sprite.size:* + text_and_sprite.text:"Sitegerelateerde info verzenden" + text_and_sprite.size:32 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:16,-252,576,-148 + extent:16,-252,600,-148 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.size:1 text.validation:"R4" } wimp_icon { @@ -3216,91 +3242,93 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:"Site historie " + text_and_sprite.text:"Sitegeschiedenis " text_and_sprite.size:18 text_and_sprite.validation:"" } wimp_icon { - extent:24,-228,164,-184 + extent:28,-228,112,-184 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Duur" + text_only:"Max." } wimp_icon { - extent:168,-232,336,-180 + extent:116,-232,240,-180 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"12" text.size:4 - text.validation:"Pptr_write;Kta" + text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:352,-224,384,-192 + extent:252,-224,284,-192 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:384,-224,416,-192 + extent:284,-224,316,-192 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:424,-228,500,-184 - icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED + extent:324,-228,596,-184 + icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"dagen" + text.text:"dagen onthouden" + text.size:16 + text.validation:"" } wimp_icon { - extent:24,-336,188,-284 + extent:24,-336,200,-284 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:208,-336,372,-284 + extent:232,-336,396,-284 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:388,-344,572,-276 + extent:412,-344,596,-276 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"con_content" - visible:1632,750,2272,1250 + visible:1248,854,1928,1354 xscroll:0 yscroll:0 next:wimp_TOP @@ -3313,21 +3341,21 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-500,640,0 + extent:0,-500,680,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:640 + xmin:656 ymin:452 - text_only:"Inhoud" + text_only:"Browsen" wimp_icon { - extent:16,-272,624,-24 + extent:16,-272,660,-24 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.size:1 text.validation:"R4" } wimp_icon { @@ -3336,119 +3364,115 @@ wimp_window { icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_and_sprite.text:" Inhoud blokkeren " + text_and_sprite.text:" Paginaverwerking " text_and_sprite.size:29 text_and_sprite.validation:"" } wimp_icon { - extent:32,-100,392,-56 + extent:32,-100,460,-56 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:"Verberg advertenties" + text_and_sprite.text:"Advertenties verbergen" text_and_sprite.size:39 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:32,-152,440,-108 + extent:32,-152,592,-108 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:"Stop pop-up windows" + text_and_sprite.text:"Pop-up vensters verhinderen" text_and_sprite.size:46 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:32,-256,344,-212 -#ifdef WITH_PLUGIN - icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO -#else + extent:32,-256,540,-212 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 - text_and_sprite.text:"Stop plug-ins" + text_and_sprite.text:"Plug-ins uitschakelen" text_and_sprite.size:42 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:16,-380,624,-288 + extent:16,-384,660,-292 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-316,492,-272 + extent:32,-320,492,-276 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:" Link doelen " + text_and_sprite.text:" Koppelingen " text_and_sprite.size:29 text_and_sprite.validation:"" } wimp_icon { - extent:32,-364,636,-320 + extent:32,-368,644,-324 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:"Links mogen nieuw venster openen" - text_and_sprite.size:* + text_and_sprite.text:"In nieuw venster openen toestaan" + text_and_sprite.size:36 text_and_sprite.validation:"Soptoff,opton" } wimp_icon { - extent:24,-464,188,-412 + extent:24,-468,200,-416 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:256,-464,420,-412 + extent:296,-468,460,-416 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:436,-472,620,-404 + extent:476,-476,660,-408 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } wimp_icon { - extent:32,-204,376,-160 + extent:32,-204,532,-160 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:"Disable JavaScript" - text_and_sprite.size:19 + text_and_sprite.text:"JavaScript uitschakelen" + text_and_sprite.size:24 text_and_sprite.validation:"Soptoff,opton" } } wimp_window { template_name:"con_connect" - visible:232,442,892,1110 + visible:1328,566,2068,1234 xscroll:0 yscroll:0 next:wimp_TOP @@ -3461,73 +3485,73 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-668,660,0 + extent:0,-668,740,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED work_flags: sprite_area:&1 - xmin:660 + xmin:740 ymin:668 - text_only:"Connectie" + text_only:"Verbinding" wimp_icon { - extent:16,-304,644,-24 + extent:16,-304,724,-24 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.size:1 text.validation:"R4" } wimp_icon { - extent:28,-52,264,-8 + extent:28,-52,232,-8 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:" HTTP Proxy " + text_and_sprite.text:" HTTP-proxy " text_and_sprite.size:15 text_and_sprite.validation:"" } wimp_icon { - extent:12,-104,184,-60 + extent:96,-104,268,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text_only:"Proxy type" + text_only:"Proxytype" } wimp_icon { - extent:188,-108,572,-56 + extent:272,-108,652,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Display field" + text.text:"Weergaveveld" text.size:32 text.validation:"R2" } wimp_icon { - extent:580,-104,624,-60 + extent:660,-104,704,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED | wimp_BUTTON_CLICK icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"R5;sgright,pgright" } wimp_icon { - extent:108,-164,184,-120 + extent:156,-164,268,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Host" - text.size:* + text.text:"Server" + text.size:7 text.validation:"" } wimp_icon { - extent:188,-168,504,-116 + extent:272,-168,584,-116 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3537,17 +3561,17 @@ wimp_window { text.validation:"Pptr_write;Kta" } wimp_icon { - extent:500,-164,528,-120 + extent:580,-164,608,-120 icon_flags:wimp_ICON_TEXT | wimp_ICON_HCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:":" - text.size:* + text.size:2 text.validation:"" } wimp_icon { - extent:524,-168,628,-116 + extent:604,-168,708,-116 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3557,17 +3581,17 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:36,-224,184,-180 + extent:12,-224,268,-180 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Gebruikernaam" - text.size:* + text.text:"Gebruikersnaam" + text.size:15 text.validation:"" } wimp_icon { - extent:188,-228,628,-176 + extent:272,-228,708,-176 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3577,17 +3601,17 @@ wimp_window { text.validation:"Pptr_write;Kta" } wimp_icon { - extent:36,-284,184,-240 + extent:44,-284,268,-240 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Wachtwoord" - text.size:* + text.size:11 text.validation:"" } wimp_icon { - extent:188,-288,628,-236 + extent:272,-288,708,-236 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3597,77 +3621,77 @@ wimp_window { text.validation:"Pptr_write;Kta;D*" } wimp_icon { - extent:16,-552,644,-332 + extent:16,-552,724,-332 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-360,268,-316 + extent:32,-360,332,-316 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:" Fetching " - text_and_sprite.size:15 + text_and_sprite.text:" Ophaalopdrachten " + text_and_sprite.size:19 text_and_sprite.validation:"" } wimp_icon { - extent:68,-412,320,-368 + extent:148,-412,408,-368 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Maximum fetches" - text.size:* + text.text:"Maximum aantal" + text.size:15 text.validation:"" } wimp_icon { - extent:324,-416,532,-364 + extent:412,-416,620,-364 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_WHITE text.text:"99" - text.size:* + text.size:3 text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:548,-408,580,-376 + extent:636,-408,668,-376 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:580,-408,612,-376 + extent:668,-408,700,-376 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:36,-472,320,-428 + extent:116,-472,408,-428 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Fetches per host" + text.text:"Aantal per server" text.size:18 text.validation:"" } wimp_icon { - extent:324,-476,532,-424 + extent:412,-476,620,-424 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3677,37 +3701,37 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:548,-468,584,-436 + extent:636,-468,672,-436 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:580,-468,612,-436 + extent:668,-468,700,-436 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:20,-532,320,-488 + extent:24,-532,408,-488 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Cached connections" - text.size:* + text.text:"Gebufferde verbindingen" + text.size:24 text.validation:"" } wimp_icon { - extent:324,-536,532,-484 + extent:412,-536,620,-484 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | wimp_BUTTON_WRITABLE icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -3717,60 +3741,60 @@ wimp_window { text.validation:"Pptr_write;Kta;A0-9" } wimp_icon { - extent:548,-528,584,-496 + extent:636,-528,672,-496 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:580,-528,612,-496 + extent:668,-528,700,-496 icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_REPEAT icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text_and_sprite.text:"" - text_and_sprite.size:* + text_and_sprite.size:1 text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:24,-640,188,-588 + extent:24,-640,200,-588 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verstek" - text.size:* + text.text:"Standaard" + text.size:10 text.validation:"R5,3" } wimp_icon { - extent:276,-640,440,-588 + extent:360,-640,524,-588 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY text.text:"Annuleer" - text.size:* + text.size:9 text.validation:"R5,3" } wimp_icon { - extent:456,-648,640,-580 + extent:540,-648,724,-580 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Instellen" - text.size:* + text.text:"Stel in" + text.size:8 text.validation:"R6,3" } } wimp_window { template_name:"sslcert" - visible:348,306,1136,898 + visible:348,250,1136,898 xscroll:0 yscroll:0 next:wimp_TOP @@ -3783,63 +3807,63 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-592,788,0 + extent:0,-648,788,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED | 0x27000000 work_flags: sprite_area:&1 xmin:788 - ymin:592 - text.text:"SSL certificaat probleem" - text.size:* + ymin:648 + text.text:"SSL-certificaatprobleem" + text.size:24 text.validation:"" wimp_icon { - extent:16,-108,772,-16 + extent:16,-148,772,-16 icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED | wimp_ICON_INDIRECTED icon_esg:0 icon_fg:wimp_COLOUR_BLACK icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"NetSurf kan de authenticiteit van een SSL certificate niet verifieren. Verifieert u alstublieft de details hieronder." + text.text:"NetSurf kan de rechtmatigheid van een SSL-certificaat niet verifi�ren. Verifieer de details hieronder." text.size:150 text.validation:"R2;L" } wimp_icon { - extent:16,-484,772,-136 + extent:16,-548,772,-176 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.size:1 text.validation:"R4" } wimp_icon { - extent:32,-164,380,-120 + extent:32,-204,380,-160 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:" Certificaat keten " + text_and_sprite.text:" Certificaatketen " text_and_sprite.size:22 text_and_sprite.validation:"" } wimp_icon { - extent:404,-564,568,-512 + extent:404,-624,568,-572 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Verwerpen" - text.size:* + text.text:"Verwerp" + text.size:8 text.validation:"R5,3" } wimp_icon { - extent:588,-572,772,-504 + extent:588,-632,772,-564 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 icon_bg:wimp_COLOUR_VERY_LIGHT_GREY - text.text:"Accepteren" - text.size:* + text.text:"Accepteer" + text.size:10 text.validation:"R6,3" } } -- NetSurf Browser

8 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.2-747-g21cf3d6

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/21cf3d6186c57047e819d... ...commit http://git.netsurf-browser.org/netsurf.git/commit/21cf3d6186c57047e819d18... ...tree http://git.netsurf-browser.org/netsurf.git/tree/21cf3d6186c57047e819d18c8... The branch, master has been updated via 21cf3d6186c57047e819d18c83bac9aa5b95cfc3 (commit) from 74e2c86555ec6695e40c1c2ff57ac79950e8fb48 (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/commit/?id=21cf3d6186c57047e81... commit 21cf3d6186c57047e819d18c83bac9aa5b95cfc3 Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> RISC OS: fix the worst of the !Cache badness. diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb b/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb index f126ba2..485bd52 100644 --- a/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb +++ b/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb @@ -1,3 +1,17 @@ -Set Cache$FromBoot True -If "<Cache$Dir>" = "" Then Run <Obey$Dir>.!Run -Unset Cache$FromBoot \ No newline at end of file +If (("<Cache$AppDir>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$AppDir <Obey$Dir> + +IconSprites <Cache$AppDir>.!Sprites + +| Find and set up resource paths +WimpSlot -min 64k -max 64k +Run <Cache$AppDir>.Resources.ResFind CacheApp +If (("<Cache$Meta>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$Meta CacheAppRes:!Meta + +| Work out where the cache directory should be -- use Choices$User if set or Default, otherwise. +Set Cache$Suffix "<Choices$User>" +If "<Cache$Suffix>" = "" Then Set Cache$Suffix "Default" +If (("<Cache$Dir>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$Dir "<Cache$AppDir>.Caches.<Cache$Suffix>" +Unset Cache$Suffix + +| Ensure cache directory exists (sadly, unavoidable) +CDir <Cache$Dir> diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Run,feb b/riscos/distribution/!Boot/Resources/!Cache/!Run,feb index a920e39..8aead97 100644 --- a/riscos/distribution/!Boot/Resources/!Cache/!Run,feb +++ b/riscos/distribution/!Boot/Resources/!Cache/!Run,feb @@ -1,10 +1,9 @@ -Set Cache$AppDir <Obey$Dir> -IconSprites <Cache$AppDir>.!Sprites - -Run <Cache$AppDir>.Resources.ResFind CacheApp -Set Cache$Meta CacheAppRes:!Meta +Set Cache$ForceVars 1 +Run <Obey$Dir>.!Boot +Unset Cache$ForceVars RMEnsure SysLog 0.17 IfThere <SysLog$Dir>.!Run Then Run <SysLog$Dir>.!Run RMEnsure SysLog 0.17 Set Cache$SysLogMissing "True" -Run <Cache$AppDir>.!RunImage \ No newline at end of file +Wimpslot -min 128k -max 128k +Run <Cache$AppDir>.!RunImage ----------------------------------------------------------------------- Summary of changes: .../distribution/!Boot/Resources/!Cache/!Boot,feb | 20 +++++++++++++++++--- .../distribution/!Boot/Resources/!Cache/!Run,feb | 11 +++++------ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb b/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb index f126ba2..485bd52 100644 --- a/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb +++ b/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb @@ -1,3 +1,17 @@ -Set Cache$FromBoot True -If "<Cache$Dir>" = "" Then Run <Obey$Dir>.!Run -Unset Cache$FromBoot \ No newline at end of file +If (("<Cache$AppDir>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$AppDir <Obey$Dir> + +IconSprites <Cache$AppDir>.!Sprites + +| Find and set up resource paths +WimpSlot -min 64k -max 64k +Run <Cache$AppDir>.Resources.ResFind CacheApp +If (("<Cache$Meta>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$Meta CacheAppRes:!Meta + +| Work out where the cache directory should be -- use Choices$User if set or Default, otherwise. +Set Cache$Suffix "<Choices$User>" +If "<Cache$Suffix>" = "" Then Set Cache$Suffix "Default" +If (("<Cache$Dir>" = "") OR ("<Cache$ForceVars>" = "1")) Then Set Cache$Dir "<Cache$AppDir>.Caches.<Cache$Suffix>" +Unset Cache$Suffix + +| Ensure cache directory exists (sadly, unavoidable) +CDir <Cache$Dir> diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Run,feb b/riscos/distribution/!Boot/Resources/!Cache/!Run,feb index a920e39..8aead97 100644 --- a/riscos/distribution/!Boot/Resources/!Cache/!Run,feb +++ b/riscos/distribution/!Boot/Resources/!Cache/!Run,feb @@ -1,10 +1,9 @@ -Set Cache$AppDir <Obey$Dir> -IconSprites <Cache$AppDir>.!Sprites - -Run <Cache$AppDir>.Resources.ResFind CacheApp -Set Cache$Meta CacheAppRes:!Meta +Set Cache$ForceVars 1 +Run <Obey$Dir>.!Boot +Unset Cache$ForceVars RMEnsure SysLog 0.17 IfThere <SysLog$Dir>.!Run Then Run <SysLog$Dir>.!Run RMEnsure SysLog 0.17 Set Cache$SysLogMissing "True" -Run <Cache$AppDir>.!RunImage \ No newline at end of file +Wimpslot -min 128k -max 128k +Run <Cache$AppDir>.!RunImage -- NetSurf Browser

8 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.2-746-g74e2c86

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/74e2c86555ec6695e40c1... ...commit http://git.netsurf-browser.org/netsurf.git/commit/74e2c86555ec6695e40c1c2... ...tree http://git.netsurf-browser.org/netsurf.git/tree/74e2c86555ec6695e40c1c2ff... The branch, master has been updated via 74e2c86555ec6695e40c1c2ff57ac79950e8fb48 (commit) from 07c210b656a88488f62e080327ffb9a900a6c9ed (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/commit/?id=74e2c86555ec6695e40... commit 74e2c86555ec6695e40c1c2ff57ac79950e8fb48 Author: Dick Tanis <dtanis(a)ymail.com> Commit: Vincent Sanders <vince(a)kyllikki.org> Updated Dutch message translations diff --git a/resources/FatMessages b/resources/FatMessages index eafb903..5539e84 100644 --- a/resources/FatMessages +++ b/resources/FatMessages @@ -287,7 +287,7 @@ en.all.Toolbars:Toolbars de.all.Toolbars:Anzeigen und Leisten fr.all.Toolbars:Barre d'outils it.all.Toolbars:Barre strumenti -nl.all.Toolbars:Toon werkbalken +nl.all.Toolbars:Toon gereedschapbalken en.all.Render:Render de.all.Render:Rendern fr.all.Render:Rendu @@ -473,7 +473,7 @@ en.all.Toolbar:Toolbar de.all.Toolbar:Symbolleiste fr.all.Toolbar:Barre d'outils it.all.Toolbar:Barra strumenti -nl.all.Toolbar:Werkbalk +nl.all.Toolbar:Gereedschapbalk en.all.EditToolbar:Edit toolbar de.all.EditToolbar:Symbolleiste bearbeiten fr.all.EditToolbar:Éditer la barre d'outils @@ -1150,7 +1150,7 @@ en.all.TreeviewLabelVisits:Visits de.all.TreeviewLabelVisits:Visits fr.all.TreeviewLabelVisits:Visites it.all.TreeviewLabelVisits:Visite -nl.all.TreeviewLabelVisits:Bezichtigd: +nl.all.TreeviewLabelVisits:Bezocht: en.all.TreeviewLabelPeriod:Period de.all.TreeviewLabelPeriod:Period fr.all.TreeviewLabelPeriod:Période @@ -4173,12 +4173,12 @@ en.ro.HelpBrowserMenu4-2:\Rcontrol the display of NetSurf's toolbars. de.ro.HelpBrowserMenu4-2:Optionen zur Anzeige von Kontroll- und Steuerelementen. fr.ro.HelpBrowserMenu4-2:\Rcontroler l'affichage des barres d'outils de NetSurf. it.ro.HelpBrowserMenu4-2:\Rcontrolla la visualizzazione delle barre strumenti di NetSurf. -nl.ro.HelpBrowserMenu4-2:Verplaats de muispijl naar rechts om de werkbalken aan te passen. +nl.ro.HelpBrowserMenu4-2:Verplaats de muispijl naar rechts om de gereedschapbalken aan te passen. en.ro.HelpBrowserMenu4-2-0:\Stoggle the display of the toolbar buttons.|MURL bar uses the remaining space. de.ro.HelpBrowserMenu4-2-0:Schaltet die Schaltknöpfe am oberen Fensterrand ein/aus.|MDie Länge der Adressleiste wird angepaßt. fr.ro.HelpBrowserMenu4-2-0:\Safficher ou pas les boutons de la barre d'outil.|MLa barre d'URL utilise l'espace restant. it.ro.HelpBrowserMenu4-2-0:\Salterna la visualizzazione dei pulsanti della barra strumenti.|MLa barra URL coprirà lo spazio eccedente. -nl.ro.HelpBrowserMenu4-2-0:Klik met KIES om het tonen van de werkbalkknoppen aan of uit te zetten.|MDe adresbalk gebruikt de overblijvende vrijkomende ruimte. +nl.ro.HelpBrowserMenu4-2-0:Klik met KIES om het tonen van de knoppen op de gereedschapbalk aan of uit te zetten.|MDe adresbalk gebruikt de overblijvende vrijkomende ruimte. en.ro.HelpBrowserMenu4-2-1:\Stoggle the display of the address (URL) bar. de.ro.HelpBrowserMenu4-2-1:Schaltet die Adressleiste am oberen Fensterrand ein/aus. fr.ro.HelpBrowserMenu4-2-1:\Safficher ou pas la barre d'adresse (URL). @@ -4193,7 +4193,7 @@ en.ro.HelpBrowserMenu4-2-3:\Stoggle the display of the status bar.|MHorizontal s de.ro.HelpBrowserMenu4-2-3:Schaltet die Statusanzeige am unteren Fensterrand ein/aus.|MDie Länge des horizontalen Schiebebalkens wird angepaßt. fr.ro.HelpBrowserMenu4-2-3:\Safficher la barre d'état ou pas.|MLa barre de défilement horizontal utilise la largeur restante. it.ro.HelpBrowserMenu4-2-3:\Salterna la visualizzazione della barra di stato.|MLa barra di scrolling orizzontale coprirà la larghezza eccedente. -nl.ro.HelpBrowserMenu4-2-3:Klik met KIES om de werkbalkaanpasmodus in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de werkbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om de werkbalk aan te passen. +nl.ro.HelpBrowserMenu4-2-3:Klik met KIES om de aanpasmodus van de gereedschapbalk in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de gereedschapbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om deze aan te passen. en.ro.HelpBrowserMenu4-2-4:\Stoggle toolbar edit mode. de.ro.HelpBrowserMenu4-2-4:Schaltet in den Modus zur Bearbeitung der Iconleiste am oberen Fensterrand. fr.ro.HelpBrowserMenu4-2-4:\Schanger le mode d'édition de barre d'outils. @@ -4602,17 +4602,17 @@ en.ro.HelpHotlistMenu0-4:\Rcontrol the display of NetSurf's toolbars. de.ro.HelpHotlistMenu0-4:Knopfleisteneinstellungen vornehmen. fr.ro.HelpHotlistMenu0-4:\Rcontroler l'affichage des barres d'outils de Netsurf. it.ro.HelpHotlistMenu0-4:\Rcontrol the display of NetSurf's toolbars. -nl.ro.HelpHotlistMenu0-4:Verplaats de muispijl naar rechts om de werkbalken aan te passen. +nl.ro.HelpHotlistMenu0-4:Verplaats de muispijl naar rechts om de gereedschapbalken aan te passen. en.ro.HelpHotlistMenu0-4-0:\Stoggle the display of the toolbar buttons. de.ro.HelpHotlistMenu0-4-0:Anklicken um die Knopfleiste ein- bzw. auszuschalten. fr.ro.HelpHotlistMenu0-4-0:\Sbasculer l'affichage des boutons de la barre d'outils. it.ro.HelpHotlistMenu0-4-0:\Stoggle the display of the toolbar buttons. -nl.ro.HelpHotlistMenu0-4-0:Klik met KIES om het tonen van de werkbalkknoppen aan of uit te zetten. +nl.ro.HelpHotlistMenu0-4-0:Klik met KIES om het tonen van de knoppen van de gereedschapbalk aan of uit te zetten. en.ro.HelpHotlistMenu0-4-1:\Stoggle toolbar edit mode. de.ro.HelpHotlistMenu0-4-1:Anklicken zum Bearbeiten der Knopfleiste. fr.ro.HelpHotlistMenu0-4-1:\Sbasculer le mode d'édition de barre d'outils. it.ro.HelpHotlistMenu0-4-1:\Stoggle toolbar edit mode. -nl.ro.HelpHotlistMenu0-4-1:Klik met KIES om de werkbalkaanpasmodus in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de werkbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om de werkbalk aan te passen. +nl.ro.HelpHotlistMenu0-4-1:Klik met KIES om de aanpasmodus van de gereedschapbalk in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de gereedschapbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om deze aan te passen. en.ro.HelpHotlistMenu1:\Roperate on the current selection. de.ro.HelpHotlistMenu1:Untermenü Auswahl. Bearbeiten der markierten Hotlist Elemente. fr.ro.HelpHotlistMenu1:\Ragir sur la sélection en cours. @@ -4729,17 +4729,17 @@ en.ro.HelpGHistoryMenu0-3:\Rcontrol the display of NetSurf's toolbars. de.ro.HelpGHistoryMenu0-3:Die Iconleiste der globalen History verändern. fr.ro.HelpGHistoryMenu0-3:\Rcontroler l'affichage des barre d'outils de NetSurf. it.ro.HelpGHistoryMenu0-3:\Rcontrol the display of NetSurf's toolbars. -nl.ro.HelpGHistoryMenu0-3:Verplaats de muispijl naar rechts om de werkbalken aan te passen. +nl.ro.HelpGHistoryMenu0-3:Verplaats de muispijl naar rechts om de gereedschapbalken aan te passen. en.ro.HelpGHistoryMenu0-3-0:\Stoggle the display of the toolbar buttons. de.ro.HelpGHistoryMenu0-3-0:Iconleiste an- oder abschalten. fr.ro.HelpGHistoryMenu0-3-0:\Sbasculer l'affichage des boutons de la barre d'outils. it.ro.HelpGHistoryMenu0-3-0:\Stoggle the display of the toolbar buttons. -nl.ro.HelpGHistoryMenu0-3-0:Klik met KIES om het tonen van de werkbalkknoppen aan of uit te zetten. +nl.ro.HelpGHistoryMenu0-3-0:Klik met KIES om het tonen van de knoppen op de gereedschapbalk aan of uit te zetten. en.ro.HelpGHistoryMenu0-3-1:\Stoggle toolbar edit mode. de.ro.HelpGHistoryMenu0-3-1:Iconleiste bearbeiten. fr.ro.HelpGHistoryMenu0-3-1:\Sbasculer le mode d'édition de la barre d'outils. it.ro.HelpGHistoryMenu0-3-1:\Stoggle toolbar edit mode. -nl.ro.HelpGHistoryMenu0-3-1:Klik met KIES om de werkbalkaanpasmodus in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de werkbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om de werkbalk aan te passen. +nl.ro.HelpGHistoryMenu0-3-1:Klik met KIES om de aanpasmodus van de gereedschapbalk in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de gereedschapbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om deze aan te passen. en.ro.HelpGHistoryMenu1:\Roperate on the current selection. de.ro.HelpGHistoryMenu1:Die aktuelle Auswahl bearbeiten. fr.ro.HelpGHistoryMenu1:\Reffectuer une opération sur la sélection courante. @@ -4841,17 +4841,17 @@ en.ro.HelpCookiesMenu0-2:\Rcontrol the display of NetSurf's toolbars. de.ro.HelpCookiesMenu0-2:Die Iconleiste verändern. fr.ro.HelpCookiesMenu0-2:\Rcontroler l'affichage des barres d'outils de Netsurf. it.ro.HelpCookiesMenu0-2:\Rcontrol the display of NetSurf's toolbars. -nl.ro.HelpCookiesMenu0-2:Verplaats de muispijl naar rechts om de werkbalken aan te passen. +nl.ro.HelpCookiesMenu0-2:Verplaats de muispijl naar rechts om de gereedschapbalken aan te passen. en.ro.HelpCookiesMenu0-2-0:\Stoggle the display of the toolbar buttons. de.ro.HelpCookiesMenu0-2-0:Klicken mit AUSWAHL um die Iconleiste an- oder abzuschalten. fr.ro.HelpCookiesMenu0-2-0:\Sbasculer l'affichage des boutons de la barre d'outils. it.ro.HelpCookiesMenu0-2-0:\Stoggle the display of the toolbar buttons. -nl.ro.HelpCookiesMenu0-2-0:Klik met KIES om het tonen van de werkbalkknoppen aan of uit te zetten. +nl.ro.HelpCookiesMenu0-2-0:Klik met KIES om het tonen van de knoppen op de gereedschapbalk aan of uit te zetten. en.ro.HelpCookiesMenu0-2-1:\Stoggle toolbar edit mode. de.ro.HelpCookiesMenu0-2-1:Klicken mit AUSWAHL um die Iconleiste zu bearbeiten. fr.ro.HelpCookiesMenu0-2-1:\Sbasculer le mode d'édition de la barre d'outils. it.ro.HelpCookiesMenu0-2-1:\Stoggle toolbar edit mode. -nl.ro.HelpCookiesMenu0-2-1:Klik met KIES om de werkbalkaanpasmodus in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de werkbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om de werkbalk aan te passen. +nl.ro.HelpCookiesMenu0-2-1:Klik met KIES om de aanpasmodus van de gereedschapbalk in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de gereedschapbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om deze aan te passen. en.ro.HelpCookiesMenu1:\Roperate on the current selection. de.ro.HelpCookiesMenu1:Die ausgewählten Einträge bearbeiten. fr.ro.HelpCookiesMenu1:\Rfaire une opération sur la sélection courante. ----------------------------------------------------------------------- Summary of changes: resources/FatMessages | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/FatMessages b/resources/FatMessages index eafb903..5539e84 100644 --- a/resources/FatMessages +++ b/resources/FatMessages @@ -287,7 +287,7 @@ en.all.Toolbars:Toolbars de.all.Toolbars:Anzeigen und Leisten fr.all.Toolbars:Barre d'outils it.all.Toolbars:Barre strumenti -nl.all.Toolbars:Toon werkbalken +nl.all.Toolbars:Toon gereedschapbalken en.all.Render:Render de.all.Render:Rendern fr.all.Render:Rendu @@ -473,7 +473,7 @@ en.all.Toolbar:Toolbar de.all.Toolbar:Symbolleiste fr.all.Toolbar:Barre d'outils it.all.Toolbar:Barra strumenti -nl.all.Toolbar:Werkbalk +nl.all.Toolbar:Gereedschapbalk en.all.EditToolbar:Edit toolbar de.all.EditToolbar:Symbolleiste bearbeiten fr.all.EditToolbar:Éditer la barre d'outils @@ -1150,7 +1150,7 @@ en.all.TreeviewLabelVisits:Visits de.all.TreeviewLabelVisits:Visits fr.all.TreeviewLabelVisits:Visites it.all.TreeviewLabelVisits:Visite -nl.all.TreeviewLabelVisits:Bezichtigd: +nl.all.TreeviewLabelVisits:Bezocht: en.all.TreeviewLabelPeriod:Period de.all.TreeviewLabelPeriod:Period fr.all.TreeviewLabelPeriod:Période @@ -4173,12 +4173,12 @@ en.ro.HelpBrowserMenu4-2:\Rcontrol the display of NetSurf's toolbars. de.ro.HelpBrowserMenu4-2:Optionen zur Anzeige von Kontroll- und Steuerelementen. fr.ro.HelpBrowserMenu4-2:\Rcontroler l'affichage des barres d'outils de NetSurf. it.ro.HelpBrowserMenu4-2:\Rcontrolla la visualizzazione delle barre strumenti di NetSurf. -nl.ro.HelpBrowserMenu4-2:Verplaats de muispijl naar rechts om de werkbalken aan te passen. +nl.ro.HelpBrowserMenu4-2:Verplaats de muispijl naar rechts om de gereedschapbalken aan te passen. en.ro.HelpBrowserMenu4-2-0:\Stoggle the display of the toolbar buttons.|MURL bar uses the remaining space. de.ro.HelpBrowserMenu4-2-0:Schaltet die Schaltknöpfe am oberen Fensterrand ein/aus.|MDie Länge der Adressleiste wird angepaßt. fr.ro.HelpBrowserMenu4-2-0:\Safficher ou pas les boutons de la barre d'outil.|MLa barre d'URL utilise l'espace restant. it.ro.HelpBrowserMenu4-2-0:\Salterna la visualizzazione dei pulsanti della barra strumenti.|MLa barra URL coprirà lo spazio eccedente. -nl.ro.HelpBrowserMenu4-2-0:Klik met KIES om het tonen van de werkbalkknoppen aan of uit te zetten.|MDe adresbalk gebruikt de overblijvende vrijkomende ruimte. +nl.ro.HelpBrowserMenu4-2-0:Klik met KIES om het tonen van de knoppen op de gereedschapbalk aan of uit te zetten.|MDe adresbalk gebruikt de overblijvende vrijkomende ruimte. en.ro.HelpBrowserMenu4-2-1:\Stoggle the display of the address (URL) bar. de.ro.HelpBrowserMenu4-2-1:Schaltet die Adressleiste am oberen Fensterrand ein/aus. fr.ro.HelpBrowserMenu4-2-1:\Safficher ou pas la barre d'adresse (URL). @@ -4193,7 +4193,7 @@ en.ro.HelpBrowserMenu4-2-3:\Stoggle the display of the status bar.|MHorizontal s de.ro.HelpBrowserMenu4-2-3:Schaltet die Statusanzeige am unteren Fensterrand ein/aus.|MDie Länge des horizontalen Schiebebalkens wird angepaßt. fr.ro.HelpBrowserMenu4-2-3:\Safficher la barre d'état ou pas.|MLa barre de défilement horizontal utilise la largeur restante. it.ro.HelpBrowserMenu4-2-3:\Salterna la visualizzazione della barra di stato.|MLa barra di scrolling orizzontale coprirà la larghezza eccedente. -nl.ro.HelpBrowserMenu4-2-3:Klik met KIES om de werkbalkaanpasmodus in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de werkbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om de werkbalk aan te passen. +nl.ro.HelpBrowserMenu4-2-3:Klik met KIES om de aanpasmodus van de gereedschapbalk in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de gereedschapbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om deze aan te passen. en.ro.HelpBrowserMenu4-2-4:\Stoggle toolbar edit mode. de.ro.HelpBrowserMenu4-2-4:Schaltet in den Modus zur Bearbeitung der Iconleiste am oberen Fensterrand. fr.ro.HelpBrowserMenu4-2-4:\Schanger le mode d'édition de barre d'outils. @@ -4602,17 +4602,17 @@ en.ro.HelpHotlistMenu0-4:\Rcontrol the display of NetSurf's toolbars. de.ro.HelpHotlistMenu0-4:Knopfleisteneinstellungen vornehmen. fr.ro.HelpHotlistMenu0-4:\Rcontroler l'affichage des barres d'outils de Netsurf. it.ro.HelpHotlistMenu0-4:\Rcontrol the display of NetSurf's toolbars. -nl.ro.HelpHotlistMenu0-4:Verplaats de muispijl naar rechts om de werkbalken aan te passen. +nl.ro.HelpHotlistMenu0-4:Verplaats de muispijl naar rechts om de gereedschapbalken aan te passen. en.ro.HelpHotlistMenu0-4-0:\Stoggle the display of the toolbar buttons. de.ro.HelpHotlistMenu0-4-0:Anklicken um die Knopfleiste ein- bzw. auszuschalten. fr.ro.HelpHotlistMenu0-4-0:\Sbasculer l'affichage des boutons de la barre d'outils. it.ro.HelpHotlistMenu0-4-0:\Stoggle the display of the toolbar buttons. -nl.ro.HelpHotlistMenu0-4-0:Klik met KIES om het tonen van de werkbalkknoppen aan of uit te zetten. +nl.ro.HelpHotlistMenu0-4-0:Klik met KIES om het tonen van de knoppen van de gereedschapbalk aan of uit te zetten. en.ro.HelpHotlistMenu0-4-1:\Stoggle toolbar edit mode. de.ro.HelpHotlistMenu0-4-1:Anklicken zum Bearbeiten der Knopfleiste. fr.ro.HelpHotlistMenu0-4-1:\Sbasculer le mode d'édition de barre d'outils. it.ro.HelpHotlistMenu0-4-1:\Stoggle toolbar edit mode. -nl.ro.HelpHotlistMenu0-4-1:Klik met KIES om de werkbalkaanpasmodus in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de werkbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om de werkbalk aan te passen. +nl.ro.HelpHotlistMenu0-4-1:Klik met KIES om de aanpasmodus van de gereedschapbalk in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de gereedschapbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om deze aan te passen. en.ro.HelpHotlistMenu1:\Roperate on the current selection. de.ro.HelpHotlistMenu1:Untermenü Auswahl. Bearbeiten der markierten Hotlist Elemente. fr.ro.HelpHotlistMenu1:\Ragir sur la sélection en cours. @@ -4729,17 +4729,17 @@ en.ro.HelpGHistoryMenu0-3:\Rcontrol the display of NetSurf's toolbars. de.ro.HelpGHistoryMenu0-3:Die Iconleiste der globalen History verändern. fr.ro.HelpGHistoryMenu0-3:\Rcontroler l'affichage des barre d'outils de NetSurf. it.ro.HelpGHistoryMenu0-3:\Rcontrol the display of NetSurf's toolbars. -nl.ro.HelpGHistoryMenu0-3:Verplaats de muispijl naar rechts om de werkbalken aan te passen. +nl.ro.HelpGHistoryMenu0-3:Verplaats de muispijl naar rechts om de gereedschapbalken aan te passen. en.ro.HelpGHistoryMenu0-3-0:\Stoggle the display of the toolbar buttons. de.ro.HelpGHistoryMenu0-3-0:Iconleiste an- oder abschalten. fr.ro.HelpGHistoryMenu0-3-0:\Sbasculer l'affichage des boutons de la barre d'outils. it.ro.HelpGHistoryMenu0-3-0:\Stoggle the display of the toolbar buttons. -nl.ro.HelpGHistoryMenu0-3-0:Klik met KIES om het tonen van de werkbalkknoppen aan of uit te zetten. +nl.ro.HelpGHistoryMenu0-3-0:Klik met KIES om het tonen van de knoppen op de gereedschapbalk aan of uit te zetten. en.ro.HelpGHistoryMenu0-3-1:\Stoggle toolbar edit mode. de.ro.HelpGHistoryMenu0-3-1:Iconleiste bearbeiten. fr.ro.HelpGHistoryMenu0-3-1:\Sbasculer le mode d'édition de la barre d'outils. it.ro.HelpGHistoryMenu0-3-1:\Stoggle toolbar edit mode. -nl.ro.HelpGHistoryMenu0-3-1:Klik met KIES om de werkbalkaanpasmodus in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de werkbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om de werkbalk aan te passen. +nl.ro.HelpGHistoryMenu0-3-1:Klik met KIES om de aanpasmodus van de gereedschapbalk in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de gereedschapbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om deze aan te passen. en.ro.HelpGHistoryMenu1:\Roperate on the current selection. de.ro.HelpGHistoryMenu1:Die aktuelle Auswahl bearbeiten. fr.ro.HelpGHistoryMenu1:\Reffectuer une opération sur la sélection courante. @@ -4841,17 +4841,17 @@ en.ro.HelpCookiesMenu0-2:\Rcontrol the display of NetSurf's toolbars. de.ro.HelpCookiesMenu0-2:Die Iconleiste verändern. fr.ro.HelpCookiesMenu0-2:\Rcontroler l'affichage des barres d'outils de Netsurf. it.ro.HelpCookiesMenu0-2:\Rcontrol the display of NetSurf's toolbars. -nl.ro.HelpCookiesMenu0-2:Verplaats de muispijl naar rechts om de werkbalken aan te passen. +nl.ro.HelpCookiesMenu0-2:Verplaats de muispijl naar rechts om de gereedschapbalken aan te passen. en.ro.HelpCookiesMenu0-2-0:\Stoggle the display of the toolbar buttons. de.ro.HelpCookiesMenu0-2-0:Klicken mit AUSWAHL um die Iconleiste an- oder abzuschalten. fr.ro.HelpCookiesMenu0-2-0:\Sbasculer l'affichage des boutons de la barre d'outils. it.ro.HelpCookiesMenu0-2-0:\Stoggle the display of the toolbar buttons. -nl.ro.HelpCookiesMenu0-2-0:Klik met KIES om het tonen van de werkbalkknoppen aan of uit te zetten. +nl.ro.HelpCookiesMenu0-2-0:Klik met KIES om het tonen van de knoppen op de gereedschapbalk aan of uit te zetten. en.ro.HelpCookiesMenu0-2-1:\Stoggle toolbar edit mode. de.ro.HelpCookiesMenu0-2-1:Klicken mit AUSWAHL um die Iconleiste zu bearbeiten. fr.ro.HelpCookiesMenu0-2-1:\Sbasculer le mode d'édition de la barre d'outils. it.ro.HelpCookiesMenu0-2-1:\Stoggle toolbar edit mode. -nl.ro.HelpCookiesMenu0-2-1:Klik met KIES om de werkbalkaanpasmodus in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de werkbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om de werkbalk aan te passen. +nl.ro.HelpCookiesMenu0-2-1:Klik met KIES om de aanpasmodus van de gereedschapbalk in of uit te schakelen. Wanneer ingeschakelt, verschijnt er een balk onder de gereedschapbalk met extra knoppen die van en naar deze balk gesleept kunnen worden om deze aan te passen. en.ro.HelpCookiesMenu1:\Roperate on the current selection. de.ro.HelpCookiesMenu1:Die ausgewählten Einträge bearbeiten. fr.ro.HelpCookiesMenu1:\Rfaire une opération sur la sélection courante. -- NetSurf Browser

8 years, 1 month

1
0
0 / 0

netsurf: branch chris/bitmap-fonts deleted. release/3.2-731-g947c466

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/000000000000000000000... ...commit http://git.netsurf-browser.org/netsurf.git/commit/00000000000000000000000... ...tree http://git.netsurf-browser.org/netsurf.git/tree/0000000000000000000000000... The branch, chris/bitmap-fonts has been deleted was 947c466c4ba63ad84c0121453975a34935d0c1e8 ----------------------------------------------------------------------- 947c466c4ba63ad84c0121453975a34935d0c1e8 Split plotting and widthing functions up ----------------------------------------------------------------------- -- NetSurf Browser

8 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.2-745-g07c210b

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/07c210b656a88488f62e0... ...commit http://git.netsurf-browser.org/netsurf.git/commit/07c210b656a88488f62e080... ...tree http://git.netsurf-browser.org/netsurf.git/tree/07c210b656a88488f62e08032... The branch, master has been updated via 07c210b656a88488f62e080327ffb9a900a6c9ed (commit) via 5baf48859a71060bbe6e81335431fcda6c91a0f8 (commit) via 947c466c4ba63ad84c0121453975a34935d0c1e8 (commit) via df25135a4d2007510b03487b517dad13b23f1a98 (commit) via 5f72dd2f0f97222c8abf41b7ed06c7673aa2e532 (commit) via 1ea747196ea9f1b01dcb29fedac62372ca0e300b (commit) via a18f79ee5edb5b39263ac84627a86752bfea827d (commit) via 68c6ba3a708c98ab8ab77e1d30f9d9f0e632acd3 (commit) via ce060f3c133eb4e36ab0fa5777c779df74c18f34 (commit) via 28a6a63b4f5c3e2a50561199305976db1dcb81fa (commit) via 805c1a2dca04cee55cfb73ae99ae86f32c5733ca (commit) via 821a13d740d7ee4d9dafffb8e78efaca49dbfc87 (commit) via 85df94f47a32ecea89e6905fb43af69a0a392fc6 (commit) via 6fda772b892c18f100c066bd9207156716b43f32 (commit) via 5d43025adfa9eb6317515fcce80ee410f30558ee (commit) via 33d16e170e6a75d81a188afb35bb5e3517a410e9 (commit) via 20630d799194954c53cd976f7de848a3cf47e297 (commit) via 5bd9b45758a91f7b792d7da5657cfcec9b081481 (commit) via f123ed101f6651b15175a9cf33038bf54975dd8b (commit) from 2ce332f1b07af89ce387ca24cc6471f97c80154b (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/commit/?id=07c210b656a88488f62... commit 07c210b656a88488f62e080327ffb9a900a6c9ed Merge: 2ce332f 5baf488 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Fix hook functions for 68k Add (partially working) bitmap fonts support commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=5baf48859a71060bbe6... commit 5baf48859a71060bbe6e81335431fcda6c91a0f8 Merge: 947c466 2ce332f Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/bitmap-fonts ----------------------------------------------------------------------- Summary of changes: amiga/Makefile.target | 3 +- amiga/agclass/amigaguide_class.c | 11 +- amiga/context_menu.c | 10 +- amiga/file.c | 7 +- amiga/font.c | 198 +++-- amiga/font.h | 16 +- amiga/font_bitmap.c | 232 +++++ amiga/gui.c | 21 +- amiga/gui.h | 6 + amiga/history_local.c | 4 +- amiga/menu.c | 1733 +++++++++++++++++++------------------- amiga/options.h | 1 + amiga/plotters.c | 2 +- amiga/tree.c | 2 +- 14 files changed, 1268 insertions(+), 978 deletions(-) create mode 100644 amiga/font_bitmap.c diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 32e076c..215ee09 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -74,7 +74,8 @@ S_AMIGA := gui.c tree.c history.c hotlist.c schedule.c file.c \ sslcert.c gui_options.c print.c theme.c drag.c icon.c libs.c \ datatypes.c dt_picture.c dt_anim.c dt_sound.c plugin_hack.c \ stringview/stringview.c stringview/urlhistory.c rtg.c \ - agclass/amigaguide_class.c fs_backing_store.c os3support.c + agclass/amigaguide_class.c fs_backing_store.c os3support.c \ + font_bitmap.c S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) # This is the final source build list diff --git a/amiga/agclass/amigaguide_class.c b/amiga/agclass/amigaguide_class.c index 556445e..2b80223 100644 --- a/amiga/agclass/amigaguide_class.c +++ b/amiga/agclass/amigaguide_class.c @@ -7,7 +7,11 @@ #include "amiga/os3support.h" #include "amigaguide_class.h" - +#ifdef __amigaos4__ +#define DISPATCHHOOK(func) static uint32 func(Class *cl, Object *o, Msg msg) +#else +#define DISPATCHHOOK(func) static ASM uint32 func(REG(a0, Class *cl),REG(a2, Object *o), REG(a1, Msg msg)) +#endif struct localObjectData { @@ -24,7 +28,8 @@ struct AmigaGuideIFace *IAmigaGuide = NULL; /* ********************************** function prototypes ************************************ */ -static uint32 dispatchAGClass(Class *, Object *, Msg); +DISPATCHHOOK(dispatchAGClass); + // class methods uint32 om_new(Class *, Object *, struct opSet *); @@ -89,7 +94,7 @@ BOOL freeAGClass(Class *cl) /* ************************************** class dispatcher ************************************ */ -static uint32 dispatchAGClass(Class *cl, Object *o, Msg msg) +DISPATCHHOOK(dispatchAGClass) { switch (msg->MethodID) diff --git a/amiga/context_menu.c b/amiga/context_menu.c index b74affb..970490e 100644 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -52,12 +52,12 @@ #include "amiga/context_menu.h" -static uint32 ami_context_menu_hook(struct Hook *hook, Object *item, APTR reserved); +HOOKF(uint32, ami_context_menu_hook, Object *, item, APTR); +HOOKF(uint32, ami_popup_hook, Object *, item, APTR); + static bool ami_context_menu_history(const struct browser_window *bw, int x0, int y0, int x1, int y1, const struct history_entry *entry, void *user_data); -static uint32 ami_popup_hook(struct Hook *hook,Object *item,APTR reserved); - enum { CMID_SELECTFILE, CMID_COPYURL, @@ -695,7 +695,7 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) IDoMethod(ctxmenuobj, PM_OPEN, gwin->win); } -static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved) +HOOKF(uint32, ami_context_menu_hook, Object *, item, APTR) { int32 itemid = 0; struct gui_window_2 *gwin = hook->h_Data; @@ -1255,7 +1255,7 @@ static bool ami_context_menu_history(const struct browser_window *bw, return true; } -static uint32 ami_popup_hook(struct Hook *hook,Object *item,APTR reserved) +HOOKF(uint32, ami_popup_hook, Object *, item, APTR) { uint32 itemid = 0; struct gui_window *gwin = hook->h_Data; diff --git a/amiga/file.c b/amiga/file.c index 733c9c7..e7f1fd3 100644 --- a/amiga/file.c +++ b/amiga/file.c @@ -46,8 +46,7 @@ static struct Hook aslhookfunc; -static ULONG ami_file_asl_mime_hook(struct Hook *mh, - struct FileRequester *fr, struct AnchorPathOld *ap) +HOOKF(ULONG, ami_file_asl_mime_hook, struct FileRequester *, fr, struct AnchorPathOld *) { char fname[1024]; BOOL ret = FALSE; @@ -56,10 +55,10 @@ static ULONG ami_file_asl_mime_hook(struct Hook *mh, lwc_error lerror; content_type ct; - if(ap->ap_Info.fib_DirEntryType > 0) return(TRUE); + if(msg->ap_Info.fib_DirEntryType > 0) return(TRUE); strcpy(fname,fr->fr_Drawer); - AddPart(fname,ap->ap_Info.fib_FileName,1024); + AddPart(fname, msg->ap_Info.fib_FileName,1024); mt = strdup(fetch_filetype(fname)); lerror = lwc_intern_string(mt, strlen(mt), &lwc_mt); diff --git a/amiga/font.c b/amiga/font.c index 435e759..32f12f2 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -152,38 +152,21 @@ lwc_string *glypharray[0xffff + 1]; ULONG ami_devicedpi; ULONG ami_xdpi; -int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, +static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, uint16 *char1, uint16 *char2, uint32 x, uint32 y, uint32 emwidth, bool aa); -int32 ami_font_width_glyph(struct OutlineFont *ofont, +static inline int32 ami_font_width_glyph(struct OutlineFont *ofont, const uint16 *char1, const uint16 *char2, uint32 emwidth); -struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, +static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, const uint16 *codepoint); static void ami_font_cleanup(struct MinList *ami_font_list); +static inline ULONG ami_font_unicode_width(const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG x, ULONG y, bool aa); -static bool nsfont_width(const plot_font_style_t *fstyle, - const char *string, size_t length, - int *width); - -static bool nsfont_position_in_string(const plot_font_style_t *fstyle, - const char *string, size_t length, - int x, size_t *char_offset, int *actual_x); - -static bool nsfont_split(const plot_font_style_t *fstyle, - const char *string, size_t length, - int x, size_t *char_offset, int *actual_x); - -const struct font_functions nsfont = { - nsfont_width, - nsfont_position_in_string, - nsfont_split -}; - - -bool nsfont_width(const plot_font_style_t *fstyle, +static inline bool amiga_nsfont_width(const plot_font_style_t *fstyle, const char *string, size_t length, int *width) { - *width = ami_unicode_text(NULL, string, length, fstyle, 0, 0, false); + *width = ami_font_unicode_width(string, length, fstyle, 0, 0, false); if(*width <= 0) *width == length; // fudge @@ -202,7 +185,7 @@ bool nsfont_width(const plot_font_style_t *fstyle, * \return true on success, false on error and error reported */ -bool nsfont_position_in_string(const plot_font_style_t *fstyle, +static inline bool amiga_nsfont_position_in_string(const plot_font_style_t *fstyle, const char *string, size_t length, int x, size_t *char_offset, int *actual_x) { @@ -289,7 +272,7 @@ bool nsfont_position_in_string(const plot_font_style_t *fstyle, * Returning char_offset == length means no split possible */ -bool nsfont_split(const plot_font_style_t *fstyle, +static inline bool amiga_nsfont_split(const plot_font_style_t *fstyle, const char *string, size_t length, int x, size_t *char_offset, int *actual_x) { @@ -428,7 +411,7 @@ static struct ami_font_node *ami_font_open(const char *font) * \param codepoint open a default font instead of the one specified by fstyle * \return outline font or NULL on error */ -struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, +static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, const uint16 *codepoint) { struct ami_font_node *node; @@ -567,7 +550,7 @@ struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, return NULL; } -int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, +static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, uint16 *char1, uint16 *char2, uint32 x, uint32 y, uint32 emwidth, bool aa) { struct GlyphMap *glyph; @@ -580,12 +563,12 @@ int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, struct BulletBase *BulletBase = ofont->BulletBase; #endif - if ((*char1 >= 0xD800) && (*char1 <= 0xDBFF)) { + if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) { /* We don't support UTF-16 surrogates yet, so just return. */ return 0; } - if ((*char2 >= 0xD800) && (*char2 <= 0xDBFF)) { + if (__builtin_expect(((*char2 >= 0xD800) && (*char2 <= 0xDBFF)), 0)) { /* Don't attempt to kern a UTF-16 surrogate */ *char2 = 0; } @@ -658,7 +641,7 @@ int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, return char_advance; } -int32 ami_font_width_glyph(struct OutlineFont *ofont, +static inline int32 ami_font_width_glyph(struct OutlineFont *ofont, const uint16 *char1, const uint16 *char2, uint32 emwidth) { int32 char_advance = 0; @@ -671,12 +654,12 @@ int32 ami_font_width_glyph(struct OutlineFont *ofont, struct BulletBase *BulletBase = ofont->BulletBase; #endif - if ((*char1 >= 0xD800) && (*char1 <= 0xDBFF)) { + if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) { /* We don't support UTF-16 surrogates yet, so just return. */ return 0; } - - if ((*char2 >= 0xD800) && (*char2 <= 0xDBFF)) { + + if (__builtin_expect(((*char2 >= 0xD800) && (*char2 <= 0xDBFF)), 0)) { /* Don't attempt to kern a UTF-16 surrogate */ skip_c2 = true; } @@ -737,7 +720,7 @@ static const uint16 *ami_font_translate_smallcaps(uint16 *utf16char) return utf16char; } -ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, +ULONG ami_font_unicode_text(struct RastPort *rp, const char *string, ULONG length, const plot_font_style_t *fstyle, ULONG dx, ULONG dy, bool aa) { uint16 *utf16 = NULL, *outf16 = NULL; @@ -751,6 +734,11 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, if(!string || string[0]=='\0') return 0; if(!length) return 0; + if(rp == NULL) return 0; + + if(__builtin_expect(nsoption_bool(use_diskfont) == true, 0)) { + return ami_font_bm_text(rp, string, length, fstyle, dx, dy); + } if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != NSERROR_OK) return 0; outf16 = utf16; @@ -770,22 +758,14 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, utf16charsc = (uint16 *)ami_font_translate_smallcaps(utf16); utf16nextsc = (uint16 *)ami_font_translate_smallcaps(utf16next); - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, utf16charsc, utf16nextsc, + tempx = ami_font_plot_glyph(ofont, rp, utf16charsc, utf16nextsc, dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, utf16charsc, utf16nextsc, emwidth); - } } else tempx = 0; if(tempx == 0) { - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, utf16, utf16next, + tempx = ami_font_plot_glyph(ofont, rp, utf16, utf16next, dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, utf16, utf16next, emwidth); - } } if(tempx == 0) @@ -795,26 +775,73 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, ufont = ami_open_outline_font(fstyle, utf16); } - if(ufont) + if(ufont) { + tempx = ami_font_plot_glyph(ufont, rp, utf16, utf16next, + dx + x, dy, emwidth, aa); + } + } + + x += tempx; + + utf16 += utf16charlen; + } + + free(outf16); + return x; +} + +static inline ULONG ami_font_unicode_width(const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG dx, ULONG dy, bool aa) +{ + uint16 *utf16 = NULL, *outf16 = NULL; + uint16 *utf16charsc = 0, *utf16nextsc = 0; + uint16 *utf16next = 0; + int utf16charlen; + struct OutlineFont *ofont, *ufont = NULL; + uint32 x=0; + int32 tempx = 0; + ULONG emwidth = (ULONG)NSA_FONT_EMWIDTH(fstyle->size); + + if(!string || string[0]=='\0') return 0; + if(!length) return 0; + + if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != NSERROR_OK) return 0; + outf16 = utf16; + if(!(ofont = ami_open_outline_font(fstyle, 0))) return 0; + + while(*utf16 != 0) + { + if ((*utf16 < 0xD800) || (0xDBFF < *utf16)) + utf16charlen = 1; + else + utf16charlen = 2; + + utf16next = &utf16[utf16charlen]; + + if(fstyle->flags & FONTF_SMALLCAPS) + { + utf16charsc = (uint16 *)ami_font_translate_smallcaps(utf16); + utf16nextsc = (uint16 *)ami_font_translate_smallcaps(utf16next); + + tempx = ami_font_width_glyph(ofont, utf16charsc, utf16nextsc, emwidth); + } + else tempx = 0; + + if(tempx == 0) { + tempx = ami_font_width_glyph(ofont, utf16, utf16next, emwidth); + } + + if(tempx == 0) + { + if(ufont == NULL) { - if(rp) { - tempx = ami_font_plot_glyph(ufont, rp, utf16, utf16next, - dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ufont, utf16, utf16next, emwidth); - } + ufont = ami_open_outline_font(fstyle, utf16); } -/* - if(tempx == 0) + + if(ufont) { - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, 0xfffd, utf16next, - dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, 0xfffd, utf16next, emwidth); - } + tempx = ami_font_width_glyph(ufont, utf16, utf16next, emwidth); } -*/ } x += tempx; @@ -905,6 +932,11 @@ void ami_font_setdevicedpi(int id) ULONG ydpi = nsoption_int(screen_ydpi); ULONG xdpi = nsoption_int(screen_ydpi); + if(nsoption_bool(use_diskfont) == true) { + LOG(("WARNING: Using diskfont.library for text. Forcing DPI to 72.")); + nsoption_int(screen_ydpi) = 72; + } + browser_set_dpi(nsoption_int(screen_ydpi)); if(id && (nsoption_int(monitor_aspect_x) != 0) && (nsoption_int(monitor_aspect_y) != 0)) @@ -949,3 +981,47 @@ void ami_font_close_disk_font(struct TextFont *tfont) { CloseFont(tfont); } + + +/* Stub entry points */ +static bool nsfont_width(const plot_font_style_t *fstyle, + const char *string, size_t length, + int *width) +{ + if(__builtin_expect(nsoption_bool(use_diskfont) == false, 1)) { + return amiga_nsfont_width(fstyle, string, length, width); + } else { + return amiga_bm_nsfont_width(fstyle, string, length, width); + } +} + +static bool nsfont_position_in_string(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) +{ + if(__builtin_expect(nsoption_bool(use_diskfont) == false, 1)) { + return amiga_nsfont_position_in_string(fstyle, string, length, x, + char_offset, actual_x); + } else { + return amiga_bm_nsfont_position_in_string(fstyle, string, length, x, + char_offset, actual_x); + } +} + +static bool nsfont_split(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) +{ + if(__builtin_expect(nsoption_bool(use_diskfont) == false, 1)) { + return amiga_nsfont_split(fstyle, string, length, x, char_offset, actual_x); + } else { + return amiga_bm_nsfont_split(fstyle, string, length, x, char_offset, actual_x); + } +} + +const struct font_functions nsfont = { + nsfont_width, + nsfont_position_in_string, + nsfont_split +}; + diff --git a/amiga/font.h b/amiga/font.h index 10137f7..375e150 100755 --- a/amiga/font.h +++ b/amiga/font.h @@ -25,7 +25,7 @@ struct ami_font_node; -ULONG ami_unicode_text(struct RastPort *rp, const char *string, +ULONG ami_font_unicode_text(struct RastPort *rp, const char *string, ULONG length, const plot_font_style_t *fstyle, ULONG x, ULONG y, bool aa); void ami_font_setdevicedpi(int id); void ami_init_fonts(void); @@ -40,4 +40,18 @@ void ami_font_savescanner(void); /* Simple diskfont functions for graphics.library use (not page rendering) */ struct TextFont *ami_font_open_disk_font(struct TextAttr *tattr); void ami_font_close_disk_font(struct TextFont *tfont); + +/* In font_bitmap.c */ +bool amiga_bm_nsfont_width(const plot_font_style_t *fstyle, + const char *string, size_t length, int *width); +bool amiga_bm_nsfont_position_in_string(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x); +bool amiga_bm_nsfont_split(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x); +ULONG ami_font_bm_text(struct RastPort *rp, const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG dx, ULONG dy); + #endif + diff --git a/amiga/font_bitmap.c b/amiga/font_bitmap.c new file mode 100644 index 0000000..8f142ae --- /dev/null +++ b/amiga/font_bitmap.c @@ -0,0 +1,232 @@ +/* + * Copyright 2008 - 2015 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "amiga/os3support.h" + +#include <assert.h> + +#include <proto/diskfont.h> +#include <proto/exec.h> +#include <proto/graphics.h> +#include <proto/timer.h> +#include <proto/utility.h> + +#include <graphics/rpattr.h> + +#include "utils/log.h" +#include "utils/utf8.h" +#include "utils/utils.h" +#include "utils/nsoption.h" +#include "desktop/browser.h" +#include "desktop/font.h" +#include "desktop/gui_window.h" + +#include "amiga/font.h" +#include "amiga/gui.h" +#include "amiga/utf8.h" + +static struct TextFont *ami_font_bm_open(struct RastPort *rp, const plot_font_style_t *fstyle) +{ + struct TextFont *bmfont = NULL; + struct TextAttr tattr; + char *fontname, *font; + + if(rp == NULL) return NULL; + + switch(fstyle->family) + { + case PLOT_FONT_FAMILY_SANS_SERIF: + fontname = nsoption_charp(font_sans); + break; + case PLOT_FONT_FAMILY_SERIF: + fontname = nsoption_charp(font_serif); + break; + case PLOT_FONT_FAMILY_MONOSPACE: + fontname = nsoption_charp(font_mono); + break; + case PLOT_FONT_FAMILY_CURSIVE: + fontname = nsoption_charp(font_cursive); + break; + case PLOT_FONT_FAMILY_FANTASY: + fontname = nsoption_charp(font_fantasy); + break; + default: + return NULL; + break; + } + + tattr.ta_Style = FS_NORMAL; + + if (fstyle->flags & FONTF_OBLIQUE) + tattr.ta_Style = FSF_ITALIC; + + if (fstyle->flags & FONTF_ITALIC) + tattr.ta_Style = FSF_ITALIC; + + if (fstyle->weight >= 700) + tattr.ta_Style |= FSF_BOLD; + + if((font = ASPrintf("%s.font", fontname))) { + tattr.ta_Name = font; + tattr.ta_YSize = fstyle->size / FONT_SIZE_SCALE; + LOG(("font: %s/%d", tattr.ta_Name, tattr.ta_YSize)); + if((bmfont = OpenDiskFont(&tattr))) { + SetRPAttrs(rp, RPTAG_Font, bmfont, TAG_DONE); + } + FreeVec(font); + } + + return bmfont; +} + +static void ami_font_bm_close(struct TextFont *bmfont) +{ + CloseFont(bmfont); +} + +bool amiga_bm_nsfont_width(const plot_font_style_t *fstyle, + const char *string, size_t length, + int *width) +{ + *width = length; + + if((glob == NULL) || (glob->rp == NULL)) return false; + + struct TextFont *bmfont = ami_font_bm_open(glob->rp, fstyle); + + if(bmfont == NULL) return false; + +// convert to local charset + *width = TextLength(glob->rp, string, length); + ami_font_bm_close(bmfont); + + return true; +} + +/** + * Find the position in a string where an x coordinate falls. + * + * \param fstyle style for this text + * \param string UTF-8 string to measure + * \param length length of string + * \param x x coordinate to search for + * \param char_offset updated to offset in string of actual_x, [0..length] + * \param actual_x updated to x coordinate of character closest to x + * \return true on success, false on error and error reported + */ + +bool amiga_bm_nsfont_position_in_string(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) +{ + struct TextExtent extent; + struct TextFont *bmfont; + + if((glob == NULL) || (glob->rp == NULL)) return false; + + bmfont = ami_font_bm_open(glob->rp, fstyle); + + if(bmfont == NULL) return false; + + // convert to local charset + *char_offset = TextFit(glob->rp, string, length, + &extent, NULL, 1, x, 32767); + + *actual_x = extent.te_Extent.MaxX; + + ami_font_bm_close(bmfont); + + return true; +} + + +/** + * Find where to split a string to make it fit a width. + * + * \param fstyle style for this text + * \param string UTF-8 string to measure + * \param length length of string + * \param x width available + * \param char_offset updated to offset in string of actual_x, [1..length] + * \param actual_x updated to x coordinate of character closest to x + * \return true on success, false on error and error reported + * + * On exit, char_offset indicates first character after split point. + * + * Note: char_offset of 0 should never be returned. + * + * Returns: + * char_offset giving split point closest to x, where actual_x <= x + * else + * char_offset giving split point closest to x, where actual_x > x + * + * Returning char_offset == length means no split possible + */ + +bool amiga_bm_nsfont_split(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) +{ + struct TextExtent extent; + ULONG co; + char *charp; + + if((glob == NULL) || (glob->rp == NULL)) return false; + + struct TextFont *bmfont = ami_font_bm_open(glob->rp, fstyle); + + if(bmfont == NULL) return false; + + co = TextFit(glob->rp, string, length, + &extent, NULL, 1, x, 32767); + + charp = string + co; + + while(((*charp != ' ')) && (charp > string)) { + charp--; + co--; + } + + if(co > 0) { + *actual_x = TextLength(glob->rp, string, co); + *char_offset = co; + } else { + *actual_x = x; + *char_offset = length; + } + + ami_font_bm_close(bmfont); + + return true; +} + +ULONG ami_font_bm_text(struct RastPort *rp, const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG dx, ULONG dy) +{ + struct TextFont *bmfont = ami_font_bm_open(rp, fstyle); + char *localtext = NULL; + if(bmfont == NULL) return 0; + if(utf8_to_local_encoding(string, length, &localtext) == NSERROR_OK) { + Move(rp, dx, dy); + Text(rp, localtext, length); + free(localtext); + } + + return 0; +} + diff --git a/amiga/gui.c b/amiga/gui.c index 753f690..184c5b0 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -204,10 +204,8 @@ void ami_get_vscroll_pos(struct gui_window_2 *gwin, ULONG *ys); void ami_quit_netsurf_delayed(void); Object *ami_gui_splash_open(void); void ami_gui_splash_close(Object *win_obj); -static uint32 ami_set_favicon_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg); -static uint32 ami_set_throbber_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg); +HOOKF(uint32, ami_set_favicon_render_hook, APTR, space, struct gpRender *); +HOOKF(uint32, ami_set_throbber_render_hook, APTR, space, struct gpRender *); bool ami_gui_map_filename(char **remapped, const char *path, const char *file, const char *map); static void ami_gui_window_update_box_deferred(struct gui_window *g, bool draw); @@ -687,7 +685,7 @@ static nsurl *gui_get_resource_url(const char *path) return url; } -static void ami_gui_newprefs_hook(struct Hook *hook, APTR window, APTR reserved) +HOOKF(void, ami_gui_newprefs_hook, APTR, window, APTR) { ami_set_screen_defaults(scrn); } @@ -3644,11 +3642,7 @@ static void ami_refresh_window(struct gui_window_2 *gwin) ami_reset_pointer(gwin); } -#ifdef __amigaos4__ -static void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg) -#else -static ASM void ami_scroller_hook(REG(a0, struct Hook *hook),REG(a2, Object *object), REG(a1, struct IntuiMessage *msg)) -#endif +HOOKF(void, ami_scroller_hook, Object *, object, struct IntuiMessage *) { ULONG gid; struct gui_window_2 *gwin = hook->h_Data; @@ -4996,9 +4990,7 @@ static nserror gui_window_set_url(struct gui_window *g, nsurl *url) return NSERROR_OK; } - -static uint32 ami_set_favicon_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg) +HOOKF(uint32, ami_set_favicon_render_hook, APTR, space, struct gpRender *) { ami_schedule(0, ami_gui_refresh_favicon, hook->h_Data); return 0; @@ -5066,8 +5058,7 @@ static nserror gui_search_web_provider_update(const char *provider_name, return NSERROR_OK; } -static uint32 ami_set_throbber_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg) +HOOKF(uint32, ami_set_throbber_render_hook, APTR, space, struct gpRender *) { struct gui_window_2 *gwin = hook->h_Data; ami_throbber_redraw_schedule(0, gwin->gw); diff --git a/amiga/gui.h b/amiga/gui.h index 246d751..adad63d 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -28,6 +28,12 @@ #include "amiga/plotters.h" #include "amiga/menu.h" +#ifdef __amigaos4__ +#define HOOKF(ret,func,type,ptr,msgtype) static ret func(struct Hook *hook, type ptr, msgtype msg) +#else +#define HOOKF(ret,func,type,ptr,msgtype) static ASM ret func(REG(a0, struct Hook *hook),REG(a2, type ptr), REG(a1, msgtype msg)) +#endif + enum { OID_MAIN = 0, diff --git a/amiga/history_local.c b/amiga/history_local.c index b56293d..3945649 100755 --- a/amiga/history_local.c +++ b/amiga/history_local.c @@ -57,7 +57,7 @@ #include "amiga/history_local.h" void ami_history_update_extent(struct history_window *hw); -static void ami_history_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg); +HOOKF(void, ami_history_scroller_hook, Object *, object, struct IntuiMessage *); /** * Redraw history window. @@ -323,7 +323,7 @@ void ami_history_update_extent(struct history_window *hw) ami_gui_free_space_box(bbox); } -void ami_history_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg) +HOOKF(void, ami_history_scroller_hook, Object *, object, struct IntuiMessage *) { ULONG gid; struct history_window *hw = hook->h_Data; diff --git a/amiga/menu.c b/amiga/menu.c index aa82037..fbb6af3 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -96,1101 +96,1066 @@ bool menu_glyphs_loaded = false; static nserror ami_menu_scan(struct tree *tree, struct gui_window_2 *gwin); void ami_menu_arexx_scan(struct gui_window_2 *gwin); -/* Functions for menu selections */ -static void ami_menu_item_project_newwin(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_newtab(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_open(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_save(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_closetab(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_closewin(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_print(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_about(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_quit(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_cut(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_copy(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_paste(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_selectall(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_clearsel(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_undo(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_redo(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_find(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_localhistory(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_globalhistory(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_cookies(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_foreimg(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_backimg(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_enablejs(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_scale_decrease(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_scale_normal(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_scale_increase(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_redraw(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_hotlist_add(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_hotlist_show(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_hotlist_entries(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_settings_edit(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_settings_snapshot(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_settings_save(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_arexx_execute(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_arexx_entries(struct Hook *hook, APTR window, struct IntuiMessage *msg); - +/* + * The below functions are called automatically by window.class when menu items are selected. + */ -void ami_free_menulabs(struct gui_window_2 *gwin) +HOOKF(void, ami_menu_item_project_newwin, APTR, window, struct IntuiMessage *) { - int i; - - for(i=0;i<=AMI_MENU_AREXX_MAX;i++) - { - if(gwin->menulab[i] && (gwin->menulab[i] != NM_BARLABEL)) - { - if(gwin->menutype[i] & MENU_IMAGE) - { - DisposeObject(gwin->menuobj[i]); - } - - ami_utf8_free(gwin->menulab[i]); - - if(i >= AMI_MENU_AREXX) - { - if(gwin->menu_hook[i].h_Data) free(gwin->menu_hook[i].h_Data); - } - } + nsurl *url; + nserror error; - gwin->menulab[i] = NULL; - gwin->menuobj[i] = NULL; - gwin->menukey[i] = 0; + error = nsurl_create(nsoption_charp(homepage_url), &url); + if (error == NSERROR_OK) { + error = browser_window_create(BW_CREATE_HISTORY, + url, + NULL, + NULL, + NULL); + nsurl_unref(url); + } + if (error != NSERROR_OK) { + warn_user(messages_get_errorcode(error), 0); } - - FreeVec(gwin->menutype); - FreeVec(gwin->menu); - - gwin->menutype = NULL; - gwin->menu = NULL; } -static void ami_menu_alloc_item(struct gui_window_2 *gwin, int num, UBYTE type, - const char *label, char key, char *icon, void *func, void *hookdata) +HOOKF(void, ami_menu_item_project_newtab, APTR, window, struct IntuiMessage *) { - char menu_icon[1024]; + struct gui_window_2 *gwin; + nserror error; - gwin->menutype[num] = type; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + error = ami_gui_new_blank_tab(gwin); +} - if((label == NM_BARLABEL) || (strcmp(label, "--") == 0)) { - gwin->menulab[num] = NM_BARLABEL; - } else { - if((num >= AMI_MENU_HOTLIST) && (num <= AMI_MENU_HOTLIST_MAX)) { - gwin->menulab[num] = ami_utf8_easy(label); - } else if((num >= AMI_MENU_AREXX) && (num <= AMI_MENU_AREXX_MAX)) { - gwin->menulab[num] = strdup(label); - } else { - gwin->menulab[num] = ami_utf8_easy(messages_get(label)); - } - } - - gwin->menuicon[num] = NULL; - if(key) gwin->menukey[num] = key; - if(func) gwin->menu_hook[num].h_Entry = (HOOKFUNC)func; - if(hookdata) gwin->menu_hook[num].h_Data = hookdata; +HOOKF(void, ami_menu_item_project_open, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - if(icon) { - if(ami_locate_resource(menu_icon, icon) == true) - gwin->menuicon[num] = (char *)strdup(menu_icon); - } + ami_file_open(gwin); } -static void ami_init_menulabs(struct gui_window_2 *gwin) +HOOKF(void, ami_menu_item_project_save, APTR, window, struct IntuiMessage *) { - int i; + struct gui_window_2 *gwin; + ULONG type = (ULONG)hook->h_Data; - gwin->menutype = ami_misc_allocvec_clear(AMI_MENU_AREXX_MAX + 1, 0); + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - for(i=0;i <= AMI_MENU_AREXX_MAX;i++) - { - gwin->menutype[i] = NM_IGNORE; - gwin->menulab[i] = NULL; - gwin->menuobj[i] = NULL; - } + ami_file_save_req(type, gwin, browser_window_get_content(gwin->gw->bw)); +} - ami_menu_alloc_item(gwin, M_PROJECT, NM_TITLE, "Project", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_NEWWIN, NM_ITEM, "NewWindowNS", 'N', NULL, - ami_menu_item_project_newwin, NULL); - ami_menu_alloc_item(gwin, M_NEWTAB, NM_ITEM, "NewTab", 'T', NULL, - ami_menu_item_project_newtab, NULL); - ami_menu_alloc_item(gwin, M_BAR_P1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_OPEN, NM_ITEM, "OpenFile", 'O', NULL, - ami_menu_item_project_open, NULL); - ami_menu_alloc_item(gwin, M_SAVEAS, NM_ITEM, "SaveAsNS", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_SAVESRC, NM_SUB, "Source", 'S', NULL, - ami_menu_item_project_save, (void *)AMINS_SAVE_SOURCE); - ami_menu_alloc_item(gwin, M_SAVETXT, NM_SUB, "TextNS", 0, NULL, - ami_menu_item_project_save, (void *)AMINS_SAVE_TEXT); - ami_menu_alloc_item(gwin, M_SAVECOMP, NM_SUB, "SaveCompNS", 0, NULL, - ami_menu_item_project_save, (void *)AMINS_SAVE_COMPLETE); -#ifdef WITH_PDF_EXPORT - ami_menu_alloc_item(gwin, M_SAVEPDF, NM_SUB, "PDFNS", 0, NULL, - ami_menu_item_project_save, (void *)AMINS_SAVE_PDF); -#endif - ami_menu_alloc_item(gwin, M_SAVEIFF, NM_SUB, "IFF", 0, NULL, - ami_menu_item_project_save, (void *)AMINS_SAVE_IFF); - ami_menu_alloc_item(gwin, M_BAR_P2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_PRINT, NM_ITEM, "PrintNS", 'P', NULL, - ami_menu_item_project_print, NULL); - ami_menu_alloc_item(gwin, M_BAR_P3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_CLOSETAB, NM_ITEM, "CloseTab", 'K', NULL, - ami_menu_item_project_closetab, NULL); - ami_menu_alloc_item(gwin, M_CLOSEWIN, NM_ITEM, "CloseWindow", 0, NULL, - ami_menu_item_project_closewin, NULL); - ami_menu_alloc_item(gwin, M_BAR_P4, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_ABOUT, NM_ITEM, "About", '?', NULL, - ami_menu_item_project_about, NULL); - ami_menu_alloc_item(gwin, M_BAR_P5, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_QUIT, NM_ITEM, "Quit", 'Q', NULL, - ami_menu_item_project_quit, NULL); +HOOKF(void, ami_menu_item_project_closetab, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - ami_menu_alloc_item(gwin, M_EDIT, NM_TITLE, "Edit", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_CUT, NM_ITEM, "CutNS", 'X', NULL, - ami_menu_item_edit_cut, NULL); - ami_menu_alloc_item(gwin, M_COPY, NM_ITEM, "CopyNS", 'C', NULL, - ami_menu_item_edit_copy, NULL); - ami_menu_alloc_item(gwin, M_PASTE, NM_ITEM, "PasteNS", 'V', NULL, - ami_menu_item_edit_paste, NULL); - ami_menu_alloc_item(gwin, M_BAR_E1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_SELALL, NM_ITEM, "SelectAllNS", 'A', NULL, - ami_menu_item_edit_selectall, NULL); - ami_menu_alloc_item(gwin, M_CLEAR, NM_ITEM, "ClearNS", 0, NULL, - ami_menu_item_edit_clearsel, NULL); - ami_menu_alloc_item(gwin, M_BAR_E2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_UNDO, NM_ITEM, "Undo", 'Z', NULL, - ami_menu_item_edit_undo, NULL); - ami_menu_alloc_item(gwin, M_REDO, NM_ITEM, "Redo", 'Y', NULL, - ami_menu_item_edit_redo, NULL); + browser_window_destroy(gwin->gw->bw); +} - ami_menu_alloc_item(gwin, M_BROWSER, NM_TITLE, "Browser", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_FIND, NM_ITEM, "FindTextNS", 'F', NULL, - ami_menu_item_browser_find, NULL); - ami_menu_alloc_item(gwin, M_BAR_B1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_HISTLOCL, NM_ITEM, "HistLocalNS", 0, NULL, - ami_menu_item_browser_localhistory, NULL); - ami_menu_alloc_item(gwin, M_HISTGLBL, NM_ITEM, "HistGlobalNS", 0, NULL, - ami_menu_item_browser_globalhistory, NULL); - ami_menu_alloc_item(gwin, M_BAR_B2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_COOKIES, NM_ITEM, "ShowCookiesNS", 0, NULL, - ami_menu_item_browser_cookies, NULL); - ami_menu_alloc_item(gwin, M_BAR_B3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_SCALE, NM_ITEM, "ScaleNS", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_SCALEDEC, NM_SUB, "ScaleDec", '-', NULL, - ami_menu_item_browser_scale_decrease, NULL); - ami_menu_alloc_item(gwin, M_SCALENRM, NM_SUB, "ScaleNorm", '=', NULL, - ami_menu_item_browser_scale_normal, NULL); - ami_menu_alloc_item(gwin, M_SCALEDEC, NM_SUB, "ScaleDec", '-', NULL, - ami_menu_item_browser_scale_decrease, NULL); - ami_menu_alloc_item(gwin, M_SCALEINC, NM_SUB, "ScaleInc", '+', NULL, - ami_menu_item_browser_scale_increase, NULL); - ami_menu_alloc_item(gwin, M_IMAGES, NM_ITEM, "Images", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_IMGFORE, NM_SUB, "ForeImg", 0, NULL, - ami_menu_item_browser_foreimg, NULL); - ami_menu_alloc_item(gwin, M_IMGBACK, NM_SUB, "BackImg", 0, NULL, - ami_menu_item_browser_backimg, NULL); -#if defined(WITH_JS) || defined(WITH_MOZJS) - ami_menu_alloc_item(gwin, M_JS, NM_ITEM, "EnableJS", 0, NULL, - ami_menu_item_browser_enablejs, NULL); -#endif - ami_menu_alloc_item(gwin, M_BAR_B4, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_REDRAW, NM_ITEM, "Redraw", 0, NULL, - ami_menu_item_browser_redraw, NULL); +HOOKF(void, ami_menu_item_project_closewin, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - ami_menu_alloc_item(gwin, M_HOTLIST, NM_TITLE, "Hotlist", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_HLADD, NM_ITEM, "HotlistAdd", 'B', NULL, - ami_menu_item_hotlist_add, NULL); - ami_menu_alloc_item(gwin, M_HLSHOW, NM_ITEM,"HotlistShowNS",'H', NULL, - ami_menu_item_hotlist_show, NULL); - ami_menu_alloc_item(gwin, M_BAR_H1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_window_close = gwin; +} - ami_menu_alloc_item(gwin, M_PREFS, NM_TITLE, "Settings", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_PREDIT, NM_ITEM, "SettingsEdit", 0, NULL, - ami_menu_item_settings_edit, NULL); - ami_menu_alloc_item(gwin, M_BAR_S1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_SNAPSHOT, NM_ITEM, "SnapshotWindow",0, NULL, - ami_menu_item_settings_snapshot, NULL); - ami_menu_alloc_item(gwin, M_PRSAVE, NM_ITEM, "SettingsSave", 0, NULL, - ami_menu_item_settings_save, NULL); +HOOKF(void, ami_menu_item_project_print, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - ami_menu_alloc_item(gwin, M_AREXX, NM_TITLE, "ARexx", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_AREXXEX, NM_ITEM, "ARexxExecute",'E', NULL, - ami_menu_item_arexx_execute, NULL); - ami_menu_alloc_item(gwin, M_BAR_A1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - gwin->menutype[AMI_MENU_AREXX_MAX] = NM_END; + ami_set_pointer(gwin, GUI_POINTER_WAIT, false); + ami_print_ui(browser_window_get_content(gwin->gw->bw)); + ami_reset_pointer(gwin); } -/* Menu refresh for hotlist */ -void ami_menu_refresh(struct gui_window_2 *gwin) +HOOKF(void, ami_menu_item_project_about, APTR, window, struct IntuiMessage *) { - SetAttrs(gwin->objects[OID_MAIN], -#ifdef __amigaos4__ - WINDOW_NewMenu, NULL, -#else - WINDOW_MenuStrip, NULL, -#endif - TAG_DONE); + struct gui_window_2 *gwin; + char *temp, *temp2; + int sel; + nsurl *url = NULL; + nserror error = NSERROR_OK; -#ifndef __amigaos4__ - ami_menu_free_os3(gwin->menu_os3); -#endif - ami_free_menulabs(gwin); - ami_create_menu(gwin); -#ifndef __amigaos4__ - gwin->menu_os3 = ami_menu_create_os3(gwin, gwin->menu); -#endif + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - SetAttrs(gwin->objects[OID_MAIN], -#ifdef __amigaos4__ - WINDOW_NewMenu, gwin->menu, -#else - WINDOW_MenuStrip, gwin->menu_os3, -#endif - TAG_DONE); -} + ami_set_pointer(gwin, GUI_POINTER_WAIT, false); -static void ami_menu_load_glyphs(struct DrawInfo *dri) -{ -#ifdef __amigaos4__ - for(int i = 0; i < NSA_GLYPH_MAX; i++) - menu_glyph[i] = NULL; + temp = ASPrintf("%s|%s|%s", messages_get("OK"), + messages_get("HelpCredits"), + messages_get("HelpLicence")); - menu_glyph[NSA_GLYPH_SUBMENU] = NewObject(NULL, "sysiclass", - SYSIA_Which, MENUSUB, - SYSIA_DrawInfo, dri, - TAG_DONE); - menu_glyph[NSA_GLYPH_AMIGAKEY] = NewObject(NULL, "sysiclass", - SYSIA_Which, AMIGAKEY, - SYSIA_DrawInfo, dri, - TAG_DONE); - GetAttr(IA_Width, menu_glyph[NSA_GLYPH_SUBMENU], - (ULONG *)&menu_glyph_width[NSA_GLYPH_SUBMENU]); - GetAttr(IA_Width, menu_glyph[NSA_GLYPH_AMIGAKEY], - (ULONG *)&menu_glyph_width[NSA_GLYPH_AMIGAKEY]); - - menu_glyphs_loaded = true; + temp2 = ami_utf8_easy(temp); + FreeVec(temp); +#ifdef __amigaos4__ + sel = TimedDosRequesterTags(TDR_ImageType,TDRIMAGE_INFO, + TDR_TitleString, messages_get("NetSurf"), + TDR_Window, gwin->win, + TDR_GadgetString, temp2, + TDR_FormatString,"NetSurf %s\nBuild date %s\n\nhttp://www.netsurf-browser.org", + TDR_Arg1,netsurf_version, + TDR_Arg2,verdate, + TAG_DONE); +#else + /*\todo proper requester for OS3 + * at the moment menus are disabled so won't get here anyway */ + printf("NetSurf %s\nBuild date %s\n", netsurf_version, verdate); + sel = 0; #endif + free(temp2); + + if(sel == 2) { + error = nsurl_create("about:credits", &url); + } else if(sel == 0) { + error = nsurl_create("about:licence", &url); + } + + if(url) { + if (error == NSERROR_OK) { + error = browser_window_create(BW_CREATE_HISTORY, + url, + NULL, + NULL, + NULL); + nsurl_unref(url); + } + if (error != NSERROR_OK) { + warn_user(messages_get_errorcode(error), 0); + } + } + + ami_reset_pointer(gwin); } -void ami_menu_free_glyphs(void) +HOOKF(void, ami_menu_item_project_quit, APTR, window, struct IntuiMessage *) { -#ifdef __amigaos4__ - int i; - if(menu_glyphs_loaded == false) return; - - for(i = 0; i < NSA_GLYPH_MAX; i++) { - if(menu_glyph[i]) DisposeObject(menu_glyph[i]); - menu_glyph[i] = NULL; - }; - - menu_glyphs_loaded = false; -#endif + ami_menu_window_close = AMI_MENU_WINDOW_CLOSE_ALL; } -static int ami_menu_calc_item_width(struct gui_window_2 *gwin, int j, struct RastPort *rp) +HOOKF(void, ami_menu_item_edit_cut, APTR, window, struct IntuiMessage *) { - int space_width = TextLength(rp, " ", 1); - int item_size; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - item_size = TextLength(rp, gwin->menulab[j], strlen(gwin->menulab[j])); - item_size += space_width; + browser_window_key_press(gwin->gw->bw, KEY_CUT_SELECTION); +} - if(gwin->menukey[j]) { - item_size += TextLength(rp, &gwin->menukey[j], 1); - item_size += menu_glyph_width[NSA_GLYPH_AMIGAKEY]; - /**TODO: take account of the size of other imagery too +HOOKF(void, ami_menu_item_edit_copy, APTR, window, struct IntuiMessage *) +{ + struct bitmap *bm; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + if(browser_window_can_select(gwin->gw->bw)) { + browser_window_key_press(gwin->gw->bw, KEY_COPY_SELECTION); + browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); + } + else if((bm = content_get_bitmap(browser_window_get_content(gwin->gw->bw)))) { + /** @todo It should be checked that the lifetime of + * the objects containing the values returned (and the + * constness cast away) is safe. */ + bm->url = (char *)nsurl_access(browser_window_get_url(gwin->gw->bw)); + bm->title = (char *)browser_window_get_title(gwin->gw->bw); + ami_easy_clipboard_bitmap(bm); } - - return item_size; +#ifdef WITH_NS_SVG + else if(ami_mime_compare(browser_window_get_content(gwin->gw->bw), "svg") == true) { + ami_easy_clipboard_svg(browser_window_get_content(gwin->gw->bw)); + } +#endif } - -static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) +HOOKF(void, ami_menu_item_edit_paste, APTR, window, struct IntuiMessage *) { - int i, j; - int txtlen = 0, subtxtlen = 0; - int left_posn; - struct RastPort *rp = &scrn->RastPort; - struct DrawInfo *dri = GetScreenDrawInfo(scrn); - int space_width = TextLength(rp, " ", 1); + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - if(menu_glyphs_loaded == false) - ami_menu_load_glyphs(dri); + browser_window_key_press(gwin->gw->bw, KEY_PASTE); +} - for(i=0; i <= AMI_MENU_AREXX_MAX; i++) - { - if(gwin->menutype[i] == NM_TITLE) { - j = i + 1; - txtlen = 0; - do { - if(gwin->menulab[j] != NM_BARLABEL) { - if(gwin->menutype[j] == NM_ITEM) { - int item_size = ami_menu_calc_item_width(gwin, j, rp); - if(item_size > txtlen) { - txtlen = item_size; - } - } - } - j++; - } while((gwin->menutype[j] != NM_TITLE) && (gwin->menutype[j] != 0)); - } -#ifdef __amigaos4__ - if(LIB_IS_AT_LEAST((struct Library *)GadToolsBase, 53, 6)) { - /* GadTools 53.6+ only. For now we will only create the menu - using label.image if there's a bitmap associated with the item. */ - if((gwin->menuicon[i] != NULL) && (gwin->menulab[i] != NM_BARLABEL)) { - int icon_width = 0; - Object *blank_space = NULL; - Object *submenuarrow = NULL; - Object *icon = BitMapObj, - BITMAP_Screen, scrn, - BITMAP_SourceFile, gwin->menuicon[i], - BITMAP_Masking, TRUE, - BitMapEnd; +HOOKF(void, ami_menu_item_edit_selectall, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - /* \todo make this scale the bitmap to these dimensions */ - SetAttrs(icon, - BITMAP_Width, 16, - BITMAP_Height, 16, - TAG_DONE); + browser_window_key_press(gwin->gw->bw, KEY_SELECT_ALL); + gui_start_selection(gwin->gw); +} - GetAttr(IA_Width, icon, (ULONG *)&icon_width); +HOOKF(void, ami_menu_item_edit_clearsel, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - if(gwin->menutype[i] == NM_SUB) { - left_posn = subtxtlen; - } else { - left_posn = txtlen; - } + browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); +} - left_posn = left_posn - - TextLength(rp, gwin->menulab[i], strlen(gwin->menulab[i])) - - icon_width - space_width; +HOOKF(void, ami_menu_item_edit_undo, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - if((gwin->menutype[i] == NM_ITEM) && (gwin->menutype[i+1] == NM_SUB)) { - left_posn -= menu_glyph_width[NSA_GLYPH_SUBMENU]; + browser_window_key_press(gwin->gw->bw, KEY_UNDO); +} - submenuarrow = NewObject(NULL, "sysiclass", - SYSIA_Which, MENUSUB, - SYSIA_DrawInfo, dri, - IA_Left, left_posn, - TAG_DONE); +HOOKF(void, ami_menu_item_edit_redo, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - j = i + 1; - subtxtlen = 0; - do { - if(gwin->menulab[j] != NM_BARLABEL) { - if(gwin->menutype[j] == NM_SUB) { - int item_size = ami_menu_calc_item_width(gwin, j, rp); - if(item_size > subtxtlen) { - subtxtlen = item_size; - } - } - } - j++; - } while((gwin->menutype[j] == NM_SUB)); - } + browser_window_key_press(gwin->gw->bw, KEY_REDO); +} - /**TODO: Checkmark/MX images and keyboard shortcuts - */ +HOOKF(void, ami_menu_item_browser_find, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - if(gwin->menutype[i] == NM_SUB) { - blank_space = NewObject(NULL, "fillrectclass", - IA_Height, 0, - IA_Width, left_posn + icon_width, - TAG_DONE); - } - - gwin->menuobj[i] = LabelObj, - LABEL_MenuMode, TRUE, - LABEL_DrawInfo, dri, - LABEL_DisposeImage, TRUE, - LABEL_Image, icon, - LABEL_Text, " ", - LABEL_Text, gwin->menulab[i], - LABEL_DisposeImage, TRUE, - LABEL_Image, blank_space, - LABEL_DisposeImage, TRUE, - LABEL_Image, submenuarrow, - LabelEnd; + ami_search_open(gwin->gw); +} - if(gwin->menuobj[i]) gwin->menutype[i] |= MENU_IMAGE; - } - } -#endif - gwin->menu[i].nm_Type = gwin->menutype[i]; - - if(gwin->menuobj[i]) - gwin->menu[i].nm_Label = (void *)gwin->menuobj[i]; - else - gwin->menu[i].nm_Label = gwin->menulab[i]; +HOOKF(void, ami_menu_item_browser_localhistory, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - if(gwin->menukey[i]) gwin->menu[i].nm_CommKey = &gwin->menukey[i]; - gwin->menu[i].nm_Flags = 0; - if(gwin->menu_hook[i].h_Entry) gwin->menu[i].nm_UserData = &gwin->menu_hook[i]; - - if(gwin->menuicon[i]) { - free(gwin->menuicon[i]); - gwin->menuicon[i] = NULL; - } - } - - FreeScreenDrawInfo(scrn, dri); - - return gwin; + ami_history_open(gwin->gw); } -#ifndef __amigaos4__ -void ami_menu_free_os3(struct gui_window_2 *gwin) +HOOKF(void, ami_menu_item_browser_globalhistory, APTR, window, struct IntuiMessage *) { - FreeMenus(gwin->menu_os3); - FreeVisualInfo(gwin->vi); + ami_tree_open(global_history_window,AMI_TREE_HISTORY); } -struct Menu *ami_menu_create_os3(struct gui_window_2 *gwin, struct NewMenu *newmenu) +HOOKF(void, ami_menu_item_browser_cookies, APTR, window, struct IntuiMessage *) { - gwin->vi = GetVisualInfo(scrn, TAG_DONE); - gwin->menu_os3 = CreateMenus(newmenu, TAG_DONE); - LayoutMenus(gwin->menu_os3, gwin->vi, - GTMN_NewLookMenus, TRUE, TAG_DONE); - - return gwin->menu_os3; + ami_tree_open(cookies_window,AMI_TREE_COOKIES); } -#endif -struct NewMenu *ami_create_menu(struct gui_window_2 *gwin) +HOOKF(void, ami_menu_item_browser_foreimg, APTR, window, struct IntuiMessage *) { - gwin->menu = ami_misc_allocvec_clear(sizeof(struct NewMenu) * (AMI_MENU_AREXX_MAX + 1), 0); - ami_init_menulabs(gwin); - ami_menu_scan(ami_tree_get_tree(hotlist_window), gwin); - ami_menu_arexx_scan(gwin); - gwin = ami_menu_layout(gwin); - -#if defined(WITH_JS) || defined(WITH_MOZJS) - gwin->menu[M_JS].nm_Flags = CHECKIT | MENUTOGGLE; - if(nsoption_bool(enable_javascript) == true) - gwin->menu[M_JS].nm_Flags |= CHECKED; -#endif + struct Menu *menustrip; + bool checked = false; - gwin->menu[M_PRINT].nm_Flags = NM_ITEMDISABLED; + GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); + if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; + + nsoption_set_bool(foreground_images, checked); + ami_menu_check_toggled = true; +} - gwin->menu[M_IMGFORE].nm_Flags = CHECKIT | MENUTOGGLE; - if(nsoption_bool(foreground_images) == true) - gwin->menu[M_IMGFORE].nm_Flags |= CHECKED; - gwin->menu[M_IMGBACK].nm_Flags = CHECKIT | MENUTOGGLE; - if(nsoption_bool(background_images) == true) - gwin->menu[M_IMGBACK].nm_Flags |= CHECKED; +HOOKF(void, ami_menu_item_browser_backimg, APTR, window, struct IntuiMessage *) +{ + struct Menu *menustrip; + bool checked = false; - return(gwin->menu); + GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); + if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; + + nsoption_set_bool(background_images, checked); + ami_menu_check_toggled = true; } -void ami_menu_arexx_scan(struct gui_window_2 *gwin) +HOOKF(void, ami_menu_item_browser_enablejs, APTR, window, struct IntuiMessage *) { - int item = AMI_MENU_AREXX; - BPTR lock = 0; - UBYTE *buffer; - struct ExAllControl *ctrl; - char matchpatt[16]; - LONG cont; - struct ExAllData *ead; - char *menu_lab; + struct Menu *menustrip; + bool checked = false; - if((lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))) { - if((buffer = AllocVecTagList(1024, NULL))) { - if((ctrl = AllocDosObject(DOS_EXALLCONTROL,NULL))) { - ctrl->eac_LastKey = 0; + GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); + if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; + + nsoption_set_bool(enable_javascript, checked); + ami_menu_check_toggled = true; +} - if(ParsePatternNoCase("#?.nsrx",(char *)&matchpatt,16) != -1) { - ctrl->eac_MatchString = (char *)&matchpatt; - } +HOOKF(void, ami_menu_item_browser_scale_decrease, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - do { - cont = ExAll(lock,(struct ExAllData *)buffer,1024,ED_COMMENT,ctrl); - if((!cont) && (IoErr() != ERROR_NO_MORE_ENTRIES)) break; - if(!ctrl->eac_Entries) continue; + if(gwin->gw->scale > 0.1) + ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1); +} - for(ead = (struct ExAllData *)buffer; ead; ead = ead->ed_Next) { - if(item >= AMI_MENU_AREXX_MAX) continue; - if(EAD_IS_FILE(ead)) { - gwin->menu[item].nm_Type = NM_ITEM; - if(ead->ed_Comment[0] != '\0') - menu_lab = ead->ed_Comment; - else - menu_lab = ead->ed_Name; +HOOKF(void, ami_menu_item_browser_scale_normal, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - ami_menu_alloc_item(gwin, item, NM_ITEM, menu_lab, 0, NULL, - ami_menu_item_arexx_entries, (void *)strdup(ead->ed_Name)); + ami_gui_set_scale(gwin->gw, 1.0); +} - item++; - } - } - } while(cont); - FreeDosObject(DOS_EXALLCONTROL,ctrl); - } - FreeVec(buffer); - } - UnLock(lock); - } +HOOKF(void, ami_menu_item_browser_scale_increase, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - gwin->menu[item].nm_Type = NM_END; - gwin->menu[item].nm_Label = NULL; + ami_gui_set_scale(gwin->gw, gwin->gw->scale + 0.1); } -static bool ami_menu_hotlist_add(void *userdata, int level, int item, const char *title, nsurl *url, bool is_folder) +HOOKF(void, ami_menu_item_browser_redraw, APTR, window, struct IntuiMessage *) { - UBYTE type; - STRPTR icon; - struct gui_window_2 *gw = (struct gui_window_2 *)userdata; - - if(item >= AMI_MENU_HOTLIST_MAX) return false; - - switch(level) { - case 1: - type = NM_ITEM; - break; - case 2: - type = NM_SUB; - break; - default: - /* entries not at level 1 or 2 are not able to be added - * \todo apparently this is possible with 4.1FE, need SDK! */ - return false; - break; - } + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - if(is_folder == true) { - icon = ASPrintf("icons/directory.png"); - } else { - icon = ami_gui_get_cache_favicon_name(url, true); - if (icon == NULL) icon = ASPrintf("icons/content.png"); - } + ami_schedule_redraw(gwin, true); + gwin->new_content = true; +} - ami_menu_alloc_item(gw, item, type, title, - 0, icon, ami_menu_item_hotlist_entries, (void *)url); - if((is_folder == true) && (type == NM_SUB)) - gw->menu[item].nm_Flags = NM_ITEMDISABLED; +HOOKF(void, ami_menu_item_hotlist_add, APTR, window, struct IntuiMessage *) +{ + struct browser_window *bw; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - if(icon) FreeVec(icon); + bw = gwin->gw->bw; - return true; + if (bw == NULL || browser_window_has_content(bw) == false) + return; + + hotlist_add_url(browser_window_get_url(bw)); + ami_gui_update_hotlist_button(gwin); } -static nserror ami_menu_scan(struct tree *tree, struct gui_window_2 *gwin) +HOOKF(void, ami_menu_item_hotlist_show, APTR, window, struct IntuiMessage *) { - return ami_hotlist_scan((void *)gwin, AMI_MENU_HOTLIST, messages_get("HotlistMenu"), ami_menu_hotlist_add); + ami_tree_open(hotlist_window, AMI_TREE_HOTLIST); } -void ami_menu_update_checked(struct gui_window_2 *gwin) +HOOKF(void, ami_menu_item_hotlist_entries, APTR, window, struct IntuiMessage *) { - struct Menu *menustrip; - - GetAttr(WINDOW_MenuStrip, gwin->objects[OID_MAIN], (ULONG *)&menustrip); - if(!menustrip) return; -#if defined(WITH_JS) || defined(WITH_MOZJS) - if(nsoption_bool(enable_javascript) == true) { - if((ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED) == 0) - ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED; - } else { - if(ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED) - ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED; - } -#endif - if(nsoption_bool(foreground_images) == true) { - if((ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags & CHECKED) == 0) - ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags ^= CHECKED; - } else { - if(ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags & CHECKED) - ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags ^= CHECKED; - } + nsurl *url = hook->h_Data; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - if(nsoption_bool(background_images) == true) { - if((ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags & CHECKED) == 0) - ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags ^= CHECKED; - } else { - if(ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags & CHECKED) - ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags ^= CHECKED; - } + if(url == NULL) return; - ResetMenuStrip(gwin->win, menustrip); + browser_window_navigate(gwin->gw->bw, + url, + NULL, + BW_NAVIGATE_HISTORY, + NULL, + NULL, + NULL); } -void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c) +HOOKF(void, ami_menu_item_settings_edit, APTR, window, struct IntuiMessage *) { - struct Window *win = g->shared->win; + ami_gui_opts_open(); +} - if(nsoption_bool(kiosk_mode) == true) return; +HOOKF(void, ami_menu_item_settings_snapshot, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - if(content_get_type(c) <= CONTENT_CSS) - { - OnMenu(win,AMI_MENU_SAVEAS_TEXT); - OnMenu(win,AMI_MENU_SAVEAS_COMPLETE); -#ifdef WITH_PDF_EXPORT - OnMenu(win,AMI_MENU_SAVEAS_PDF); -#endif - if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_COPY) - { - OnMenu(win,AMI_MENU_COPY); - OnMenu(win,AMI_MENU_CLEAR); - } else { - OffMenu(win,AMI_MENU_COPY); - OffMenu(win,AMI_MENU_CLEAR); - } + nsoption_set_int(window_x, gwin->win->LeftEdge); + nsoption_set_int(window_y, gwin->win->TopEdge); + nsoption_set_int(window_width, gwin->win->Width); + nsoption_set_int(window_height, gwin->win->Height); +} - if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_CUT) - OnMenu(win,AMI_MENU_CUT); - else - OffMenu(win,AMI_MENU_CUT); - - if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_PASTE) - OnMenu(win,AMI_MENU_PASTE); - else - OffMenu(win,AMI_MENU_PASTE); +HOOKF(void, ami_menu_item_settings_save, APTR, window, struct IntuiMessage *) +{ + nsoption_write(current_user_options, NULL, NULL); +} - OnMenu(win,AMI_MENU_SELECTALL); - OnMenu(win,AMI_MENU_FIND); - OffMenu(win,AMI_MENU_SAVEAS_IFF); - } - else - { - OffMenu(win,AMI_MENU_CUT); - OffMenu(win,AMI_MENU_PASTE); - OffMenu(win,AMI_MENU_CLEAR); +HOOKF(void, ami_menu_item_arexx_execute, APTR, window, struct IntuiMessage *) +{ + char *temp; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - OffMenu(win,AMI_MENU_SAVEAS_TEXT); - OffMenu(win,AMI_MENU_SAVEAS_COMPLETE); -#ifdef WITH_PDF_EXPORT - OffMenu(win,AMI_MENU_SAVEAS_PDF); -#endif - OffMenu(win,AMI_MENU_SELECTALL); - OffMenu(win,AMI_MENU_FIND); - -#ifdef WITH_NS_SVG - if(content_get_bitmap(c) || (ami_mime_compare(c, "svg") == true)) -#else - if(content_get_bitmap(c)) -#endif - { - OnMenu(win,AMI_MENU_COPY); - OnMenu(win,AMI_MENU_SAVEAS_IFF); - } - else - { - OffMenu(win,AMI_MENU_COPY); - OffMenu(win,AMI_MENU_SAVEAS_IFF); + if(AslRequestTags(filereq, + ASLFR_Window, gwin->win, + ASLFR_SleepWindow, TRUE, + ASLFR_TitleText, messages_get("NetSurf"), + ASLFR_Screen, scrn, + ASLFR_DoSaveMode, FALSE, + ASLFR_InitialDrawer, nsoption_charp(arexx_dir), + ASLFR_InitialPattern, "#?.nsrx", + TAG_DONE)) { + if((temp = AllocVecTagList(1024, NULL))) { + strlcpy(temp, filereq->fr_Drawer, 1024); + AddPart(temp, filereq->fr_File, 1024); + ami_arexx_execute(temp); + FreeVec(temp); } } } -/* - * The below functions are called automatically by window.class when menu items are selected. - */ - -static void ami_menu_item_project_newwin(struct Hook *hook, APTR window, struct IntuiMessage *msg) +HOOKF(void, ami_menu_item_arexx_entries, APTR, window, struct IntuiMessage *) { - nsurl *url; - nserror error; + char *script = hook->h_Data; + char *temp; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - error = nsurl_create(nsoption_charp(homepage_url), &url); - if (error == NSERROR_OK) { - error = browser_window_create(BW_CREATE_HISTORY, - url, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - if (error != NSERROR_OK) { - warn_user(messages_get_errorcode(error), 0); + if(script) { + if((temp = AllocVecTagList(1024, NULL))) { + BPTR lock; + if((lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))) { + DevNameFromLock(lock, temp, 1024, DN_FULLPATH); + AddPart(temp, script, 1024); + ami_arexx_execute(temp); + FreeVec(temp); + UnLock(lock); + } + } } } -static void ami_menu_item_project_newtab(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - nserror error; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - error = ami_gui_new_blank_tab(gwin); -} +/* menu creation code */ -static void ami_menu_item_project_open(struct Hook *hook, APTR window, struct IntuiMessage *msg) +void ami_free_menulabs(struct gui_window_2 *gwin) { - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + int i; - ami_file_open(gwin); -} + for(i=0;i<=AMI_MENU_AREXX_MAX;i++) + { + if(gwin->menulab[i] && (gwin->menulab[i] != NM_BARLABEL)) + { + if(gwin->menutype[i] & MENU_IMAGE) + { + DisposeObject(gwin->menuobj[i]); + } -static void ami_menu_item_project_save(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - ULONG type = (ULONG)hook->h_Data; + ami_utf8_free(gwin->menulab[i]); - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + if(i >= AMI_MENU_AREXX) + { + if(gwin->menu_hook[i].h_Data) free(gwin->menu_hook[i].h_Data); + } + } - ami_file_save_req(type, gwin, browser_window_get_content(gwin->gw->bw)); -} + gwin->menulab[i] = NULL; + gwin->menuobj[i] = NULL; + gwin->menukey[i] = 0; + } -static void ami_menu_item_project_closetab(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + FreeVec(gwin->menutype); + FreeVec(gwin->menu); - browser_window_destroy(gwin->gw->bw); + gwin->menutype = NULL; + gwin->menu = NULL; } -static void ami_menu_item_project_closewin(struct Hook *hook, APTR window, struct IntuiMessage *msg) +static void ami_menu_alloc_item(struct gui_window_2 *gwin, int num, UBYTE type, + const char *label, char key, char *icon, void *func, void *hookdata) { - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + char menu_icon[1024]; - ami_menu_window_close = gwin; -} + gwin->menutype[num] = type; -static void ami_menu_item_project_print(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + if((label == NM_BARLABEL) || (strcmp(label, "--") == 0)) { + gwin->menulab[num] = NM_BARLABEL; + } else { + if((num >= AMI_MENU_HOTLIST) && (num <= AMI_MENU_HOTLIST_MAX)) { + gwin->menulab[num] = ami_utf8_easy(label); + } else if((num >= AMI_MENU_AREXX) && (num <= AMI_MENU_AREXX_MAX)) { + gwin->menulab[num] = strdup(label); + } else { + gwin->menulab[num] = ami_utf8_easy(messages_get(label)); + } + } + + gwin->menuicon[num] = NULL; + if(key) gwin->menukey[num] = key; + if(func) gwin->menu_hook[num].h_Entry = (HOOKFUNC)func; + if(hookdata) gwin->menu_hook[num].h_Data = hookdata; - ami_set_pointer(gwin, GUI_POINTER_WAIT, false); - ami_print_ui(browser_window_get_content(gwin->gw->bw)); - ami_reset_pointer(gwin); + if(icon) { + if(ami_locate_resource(menu_icon, icon) == true) + gwin->menuicon[num] = (char *)strdup(menu_icon); + } } -static void ami_menu_item_project_about(struct Hook *hook, APTR window, struct IntuiMessage *msg) +static void ami_init_menulabs(struct gui_window_2 *gwin) { - struct gui_window_2 *gwin; - char *temp, *temp2; - int sel; - nsurl *url = NULL; - nserror error = NSERROR_OK; + int i; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + gwin->menutype = ami_misc_allocvec_clear(AMI_MENU_AREXX_MAX + 1, 0); - ami_set_pointer(gwin, GUI_POINTER_WAIT, false); + for(i=0;i <= AMI_MENU_AREXX_MAX;i++) + { + gwin->menutype[i] = NM_IGNORE; + gwin->menulab[i] = NULL; + gwin->menuobj[i] = NULL; + } - temp = ASPrintf("%s|%s|%s", messages_get("OK"), - messages_get("HelpCredits"), - messages_get("HelpLicence")); + ami_menu_alloc_item(gwin, M_PROJECT, NM_TITLE, "Project", 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_NEWWIN, NM_ITEM, "NewWindowNS", 'N', NULL, + ami_menu_item_project_newwin, NULL); + ami_menu_alloc_item(gwin, M_NEWTAB, NM_ITEM, "NewTab", 'T', NULL, + ami_menu_item_project_newtab, NULL); + ami_menu_alloc_item(gwin, M_BAR_P1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_OPEN, NM_ITEM, "OpenFile", 'O', NULL, + ami_menu_item_project_open, NULL); + ami_menu_alloc_item(gwin, M_SAVEAS, NM_ITEM, "SaveAsNS", 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_SAVESRC, NM_SUB, "Source", 'S', NULL, + ami_menu_item_project_save, (void *)AMINS_SAVE_SOURCE); + ami_menu_alloc_item(gwin, M_SAVETXT, NM_SUB, "TextNS", 0, NULL, + ami_menu_item_project_save, (void *)AMINS_SAVE_TEXT); + ami_menu_alloc_item(gwin, M_SAVECOMP, NM_SUB, "SaveCompNS", 0, NULL, + ami_menu_item_project_save, (void *)AMINS_SAVE_COMPLETE); +#ifdef WITH_PDF_EXPORT + ami_menu_alloc_item(gwin, M_SAVEPDF, NM_SUB, "PDFNS", 0, NULL, + ami_menu_item_project_save, (void *)AMINS_SAVE_PDF); +#endif + ami_menu_alloc_item(gwin, M_SAVEIFF, NM_SUB, "IFF", 0, NULL, + ami_menu_item_project_save, (void *)AMINS_SAVE_IFF); + ami_menu_alloc_item(gwin, M_BAR_P2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_PRINT, NM_ITEM, "PrintNS", 'P', NULL, + ami_menu_item_project_print, NULL); + ami_menu_alloc_item(gwin, M_BAR_P3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_CLOSETAB, NM_ITEM, "CloseTab", 'K', NULL, + ami_menu_item_project_closetab, NULL); + ami_menu_alloc_item(gwin, M_CLOSEWIN, NM_ITEM, "CloseWindow", 0, NULL, + ami_menu_item_project_closewin, NULL); + ami_menu_alloc_item(gwin, M_BAR_P4, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_ABOUT, NM_ITEM, "About", '?', NULL, + ami_menu_item_project_about, NULL); + ami_menu_alloc_item(gwin, M_BAR_P5, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_QUIT, NM_ITEM, "Quit", 'Q', NULL, + ami_menu_item_project_quit, NULL); - temp2 = ami_utf8_easy(temp); - FreeVec(temp); + ami_menu_alloc_item(gwin, M_EDIT, NM_TITLE, "Edit", 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_CUT, NM_ITEM, "CutNS", 'X', NULL, + ami_menu_item_edit_cut, NULL); + ami_menu_alloc_item(gwin, M_COPY, NM_ITEM, "CopyNS", 'C', NULL, + ami_menu_item_edit_copy, NULL); + ami_menu_alloc_item(gwin, M_PASTE, NM_ITEM, "PasteNS", 'V', NULL, + ami_menu_item_edit_paste, NULL); + ami_menu_alloc_item(gwin, M_BAR_E1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_SELALL, NM_ITEM, "SelectAllNS", 'A', NULL, + ami_menu_item_edit_selectall, NULL); + ami_menu_alloc_item(gwin, M_CLEAR, NM_ITEM, "ClearNS", 0, NULL, + ami_menu_item_edit_clearsel, NULL); + ami_menu_alloc_item(gwin, M_BAR_E2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_UNDO, NM_ITEM, "Undo", 'Z', NULL, + ami_menu_item_edit_undo, NULL); + ami_menu_alloc_item(gwin, M_REDO, NM_ITEM, "Redo", 'Y', NULL, + ami_menu_item_edit_redo, NULL); + + ami_menu_alloc_item(gwin, M_BROWSER, NM_TITLE, "Browser", 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_FIND, NM_ITEM, "FindTextNS", 'F', NULL, + ami_menu_item_browser_find, NULL); + ami_menu_alloc_item(gwin, M_BAR_B1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_HISTLOCL, NM_ITEM, "HistLocalNS", 0, NULL, + ami_menu_item_browser_localhistory, NULL); + ami_menu_alloc_item(gwin, M_HISTGLBL, NM_ITEM, "HistGlobalNS", 0, NULL, + ami_menu_item_browser_globalhistory, NULL); + ami_menu_alloc_item(gwin, M_BAR_B2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_COOKIES, NM_ITEM, "ShowCookiesNS", 0, NULL, + ami_menu_item_browser_cookies, NULL); + ami_menu_alloc_item(gwin, M_BAR_B3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_SCALE, NM_ITEM, "ScaleNS", 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_SCALEDEC, NM_SUB, "ScaleDec", '-', NULL, + ami_menu_item_browser_scale_decrease, NULL); + ami_menu_alloc_item(gwin, M_SCALENRM, NM_SUB, "ScaleNorm", '=', NULL, + ami_menu_item_browser_scale_normal, NULL); + ami_menu_alloc_item(gwin, M_SCALEDEC, NM_SUB, "ScaleDec", '-', NULL, + ami_menu_item_browser_scale_decrease, NULL); + ami_menu_alloc_item(gwin, M_SCALEINC, NM_SUB, "ScaleInc", '+', NULL, + ami_menu_item_browser_scale_increase, NULL); + ami_menu_alloc_item(gwin, M_IMAGES, NM_ITEM, "Images", 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_IMGFORE, NM_SUB, "ForeImg", 0, NULL, + ami_menu_item_browser_foreimg, NULL); + ami_menu_alloc_item(gwin, M_IMGBACK, NM_SUB, "BackImg", 0, NULL, + ami_menu_item_browser_backimg, NULL); +#if defined(WITH_JS) || defined(WITH_MOZJS) + ami_menu_alloc_item(gwin, M_JS, NM_ITEM, "EnableJS", 0, NULL, + ami_menu_item_browser_enablejs, NULL); +#endif + ami_menu_alloc_item(gwin, M_BAR_B4, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_REDRAW, NM_ITEM, "Redraw", 0, NULL, + ami_menu_item_browser_redraw, NULL); + + ami_menu_alloc_item(gwin, M_HOTLIST, NM_TITLE, "Hotlist", 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_HLADD, NM_ITEM, "HotlistAdd", 'B', NULL, + ami_menu_item_hotlist_add, NULL); + ami_menu_alloc_item(gwin, M_HLSHOW, NM_ITEM,"HotlistShowNS",'H', NULL, + ami_menu_item_hotlist_show, NULL); + ami_menu_alloc_item(gwin, M_BAR_H1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + + ami_menu_alloc_item(gwin, M_PREFS, NM_TITLE, "Settings", 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_PREDIT, NM_ITEM, "SettingsEdit", 0, NULL, + ami_menu_item_settings_edit, NULL); + ami_menu_alloc_item(gwin, M_BAR_S1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_SNAPSHOT, NM_ITEM, "SnapshotWindow",0, NULL, + ami_menu_item_settings_snapshot, NULL); + ami_menu_alloc_item(gwin, M_PRSAVE, NM_ITEM, "SettingsSave", 0, NULL, + ami_menu_item_settings_save, NULL); + + ami_menu_alloc_item(gwin, M_AREXX, NM_TITLE, "ARexx", 0, NULL, NULL, NULL); + ami_menu_alloc_item(gwin, M_AREXXEX, NM_ITEM, "ARexxExecute",'E', NULL, + ami_menu_item_arexx_execute, NULL); + ami_menu_alloc_item(gwin, M_BAR_A1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); + gwin->menutype[AMI_MENU_AREXX_MAX] = NM_END; +} + +/* Menu refresh for hotlist */ +void ami_menu_refresh(struct gui_window_2 *gwin) +{ + SetAttrs(gwin->objects[OID_MAIN], #ifdef __amigaos4__ - sel = TimedDosRequesterTags(TDR_ImageType,TDRIMAGE_INFO, - TDR_TitleString, messages_get("NetSurf"), - TDR_Window, gwin->win, - TDR_GadgetString, temp2, - TDR_FormatString,"NetSurf %s\nBuild date %s\n\nhttp://www.netsurf-browser.org", - TDR_Arg1,netsurf_version, - TDR_Arg2,verdate, - TAG_DONE); + WINDOW_NewMenu, NULL, #else - /*\todo proper requester for OS3 - * at the moment menus are disabled so won't get here anyway */ - printf("NetSurf %s\nBuild date %s\n", netsurf_version, verdate); - sel = 0; + WINDOW_MenuStrip, NULL, #endif - free(temp2); + TAG_DONE); - if(sel == 2) { - error = nsurl_create("about:credits", &url); - } else if(sel == 0) { - error = nsurl_create("about:licence", &url); - } +#ifndef __amigaos4__ + ami_menu_free_os3(gwin->menu_os3); +#endif + ami_free_menulabs(gwin); + ami_create_menu(gwin); +#ifndef __amigaos4__ + gwin->menu_os3 = ami_menu_create_os3(gwin, gwin->menu); +#endif - if(url) { - if (error == NSERROR_OK) { - error = browser_window_create(BW_CREATE_HISTORY, - url, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - if (error != NSERROR_OK) { - warn_user(messages_get_errorcode(error), 0); - } - } + SetAttrs(gwin->objects[OID_MAIN], +#ifdef __amigaos4__ + WINDOW_NewMenu, gwin->menu, +#else + WINDOW_MenuStrip, gwin->menu_os3, +#endif + TAG_DONE); +} - ami_reset_pointer(gwin); +static void ami_menu_load_glyphs(struct DrawInfo *dri) +{ +#ifdef __amigaos4__ + for(int i = 0; i < NSA_GLYPH_MAX; i++) + menu_glyph[i] = NULL; + + menu_glyph[NSA_GLYPH_SUBMENU] = NewObject(NULL, "sysiclass", + SYSIA_Which, MENUSUB, + SYSIA_DrawInfo, dri, + TAG_DONE); + menu_glyph[NSA_GLYPH_AMIGAKEY] = NewObject(NULL, "sysiclass", + SYSIA_Which, AMIGAKEY, + SYSIA_DrawInfo, dri, + TAG_DONE); + GetAttr(IA_Width, menu_glyph[NSA_GLYPH_SUBMENU], + (ULONG *)&menu_glyph_width[NSA_GLYPH_SUBMENU]); + GetAttr(IA_Width, menu_glyph[NSA_GLYPH_AMIGAKEY], + (ULONG *)&menu_glyph_width[NSA_GLYPH_AMIGAKEY]); + + menu_glyphs_loaded = true; +#endif } -static void ami_menu_item_project_quit(struct Hook *hook, APTR window, struct IntuiMessage *msg) +void ami_menu_free_glyphs(void) { - ami_menu_window_close = AMI_MENU_WINDOW_CLOSE_ALL; +#ifdef __amigaos4__ + int i; + if(menu_glyphs_loaded == false) return; + + for(i = 0; i < NSA_GLYPH_MAX; i++) { + if(menu_glyph[i]) DisposeObject(menu_glyph[i]); + menu_glyph[i] = NULL; + }; + + menu_glyphs_loaded = false; +#endif } -static void ami_menu_item_edit_cut(struct Hook *hook, APTR window, struct IntuiMessage *msg) +static int ami_menu_calc_item_width(struct gui_window_2 *gwin, int j, struct RastPort *rp) { - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, KEY_CUT_SELECTION); -} + int space_width = TextLength(rp, " ", 1); + int item_size; -static void ami_menu_item_edit_copy(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct bitmap *bm; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + item_size = TextLength(rp, gwin->menulab[j], strlen(gwin->menulab[j])); + item_size += space_width; - if(browser_window_can_select(gwin->gw->bw)) { - browser_window_key_press(gwin->gw->bw, KEY_COPY_SELECTION); - browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); - } - else if((bm = content_get_bitmap(browser_window_get_content(gwin->gw->bw)))) { - /** @todo It should be checked that the lifetime of - * the objects containing the values returned (and the - * constness cast away) is safe. + if(gwin->menukey[j]) { + item_size += TextLength(rp, &gwin->menukey[j], 1); + item_size += menu_glyph_width[NSA_GLYPH_AMIGAKEY]; + /**TODO: take account of the size of other imagery too */ - bm->url = (char *)nsurl_access(browser_window_get_url(gwin->gw->bw)); - bm->title = (char *)browser_window_get_title(gwin->gw->bw); - ami_easy_clipboard_bitmap(bm); - } -#ifdef WITH_NS_SVG - else if(ami_mime_compare(browser_window_get_content(gwin->gw->bw), "svg") == true) { - ami_easy_clipboard_svg(browser_window_get_content(gwin->gw->bw)); } -#endif -} - -static void ami_menu_item_edit_paste(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - browser_window_key_press(gwin->gw->bw, KEY_PASTE); + return item_size; } -static void ami_menu_item_edit_selectall(struct Hook *hook, APTR window, struct IntuiMessage *msg) + +static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) { - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + int i, j; + int txtlen = 0, subtxtlen = 0; + int left_posn; + struct RastPort *rp = &scrn->RastPort; + struct DrawInfo *dri = GetScreenDrawInfo(scrn); + int space_width = TextLength(rp, " ", 1); - browser_window_key_press(gwin->gw->bw, KEY_SELECT_ALL); - gui_start_selection(gwin->gw); -} + if(menu_glyphs_loaded == false) + ami_menu_load_glyphs(dri); -static void ami_menu_item_edit_clearsel(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + for(i=0; i <= AMI_MENU_AREXX_MAX; i++) + { + if(gwin->menutype[i] == NM_TITLE) { + j = i + 1; + txtlen = 0; + do { + if(gwin->menulab[j] != NM_BARLABEL) { + if(gwin->menutype[j] == NM_ITEM) { + int item_size = ami_menu_calc_item_width(gwin, j, rp); + if(item_size > txtlen) { + txtlen = item_size; + } + } + } + j++; + } while((gwin->menutype[j] != NM_TITLE) && (gwin->menutype[j] != 0)); + } +#ifdef __amigaos4__ + if(LIB_IS_AT_LEAST((struct Library *)GadToolsBase, 53, 6)) { + /* GadTools 53.6+ only. For now we will only create the menu + using label.image if there's a bitmap associated with the item. */ + if((gwin->menuicon[i] != NULL) && (gwin->menulab[i] != NM_BARLABEL)) { + int icon_width = 0; + Object *blank_space = NULL; + Object *submenuarrow = NULL; + Object *icon = BitMapObj, + BITMAP_Screen, scrn, + BITMAP_SourceFile, gwin->menuicon[i], + BITMAP_Masking, TRUE, + BitMapEnd; - browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); -} + /* \todo make this scale the bitmap to these dimensions */ + SetAttrs(icon, + BITMAP_Width, 16, + BITMAP_Height, 16, + TAG_DONE); -static void ami_menu_item_edit_undo(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + GetAttr(IA_Width, icon, (ULONG *)&icon_width); - browser_window_key_press(gwin->gw->bw, KEY_UNDO); -} + if(gwin->menutype[i] == NM_SUB) { + left_posn = subtxtlen; + } else { + left_posn = txtlen; + } -static void ami_menu_item_edit_redo(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + left_posn = left_posn - + TextLength(rp, gwin->menulab[i], strlen(gwin->menulab[i])) - + icon_width - space_width; - browser_window_key_press(gwin->gw->bw, KEY_REDO); -} + if((gwin->menutype[i] == NM_ITEM) && (gwin->menutype[i+1] == NM_SUB)) { + left_posn -= menu_glyph_width[NSA_GLYPH_SUBMENU]; -static void ami_menu_item_browser_find(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + submenuarrow = NewObject(NULL, "sysiclass", + SYSIA_Which, MENUSUB, + SYSIA_DrawInfo, dri, + IA_Left, left_posn, + TAG_DONE); - ami_search_open(gwin->gw); -} + j = i + 1; + subtxtlen = 0; + do { + if(gwin->menulab[j] != NM_BARLABEL) { + if(gwin->menutype[j] == NM_SUB) { + int item_size = ami_menu_calc_item_width(gwin, j, rp); + if(item_size > subtxtlen) { + subtxtlen = item_size; + } + } + } + j++; + } while((gwin->menutype[j] == NM_SUB)); + } -static void ami_menu_item_browser_localhistory(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + /**TODO: Checkmark/MX images and keyboard shortcuts + */ - ami_history_open(gwin->gw); -} + if(gwin->menutype[i] == NM_SUB) { + blank_space = NewObject(NULL, "fillrectclass", + IA_Height, 0, + IA_Width, left_posn + icon_width, + TAG_DONE); + } + + gwin->menuobj[i] = LabelObj, + LABEL_MenuMode, TRUE, + LABEL_DrawInfo, dri, + LABEL_DisposeImage, TRUE, + LABEL_Image, icon, + LABEL_Text, " ", + LABEL_Text, gwin->menulab[i], + LABEL_DisposeImage, TRUE, + LABEL_Image, blank_space, + LABEL_DisposeImage, TRUE, + LABEL_Image, submenuarrow, + LabelEnd; -static void ami_menu_item_browser_globalhistory(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - ami_tree_open(global_history_window,AMI_TREE_HISTORY); + if(gwin->menuobj[i]) gwin->menutype[i] |= MENU_IMAGE; + } + } +#endif + gwin->menu[i].nm_Type = gwin->menutype[i]; + + if(gwin->menuobj[i]) + gwin->menu[i].nm_Label = (void *)gwin->menuobj[i]; + else + gwin->menu[i].nm_Label = gwin->menulab[i]; + + if(gwin->menukey[i]) gwin->menu[i].nm_CommKey = &gwin->menukey[i]; + gwin->menu[i].nm_Flags = 0; + if(gwin->menu_hook[i].h_Entry) gwin->menu[i].nm_UserData = &gwin->menu_hook[i]; + + if(gwin->menuicon[i]) { + free(gwin->menuicon[i]); + gwin->menuicon[i] = NULL; + } + } + + FreeScreenDrawInfo(scrn, dri); + + return gwin; } -static void ami_menu_item_browser_cookies(struct Hook *hook, APTR window, struct IntuiMessage *msg) +#ifndef __amigaos4__ +void ami_menu_free_os3(struct gui_window_2 *gwin) { - ami_tree_open(cookies_window,AMI_TREE_COOKIES); + FreeMenus(gwin->menu_os3); + FreeVisualInfo(gwin->vi); } -static void ami_menu_item_browser_foreimg(struct Hook *hook, APTR window, struct IntuiMessage *msg) +struct Menu *ami_menu_create_os3(struct gui_window_2 *gwin, struct NewMenu *newmenu) { - struct Menu *menustrip; - bool checked = false; + gwin->vi = GetVisualInfo(scrn, TAG_DONE); + gwin->menu_os3 = CreateMenus(newmenu, TAG_DONE); + LayoutMenus(gwin->menu_os3, gwin->vi, + GTMN_NewLookMenus, TRUE, TAG_DONE); - GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); - if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; - - nsoption_set_bool(foreground_images, checked); - ami_menu_check_toggled = true; + return gwin->menu_os3; } +#endif -static void ami_menu_item_browser_backimg(struct Hook *hook, APTR window, struct IntuiMessage *msg) +struct NewMenu *ami_create_menu(struct gui_window_2 *gwin) { - struct Menu *menustrip; - bool checked = false; + gwin->menu = ami_misc_allocvec_clear(sizeof(struct NewMenu) * (AMI_MENU_AREXX_MAX + 1), 0); + ami_init_menulabs(gwin); + ami_menu_scan(ami_tree_get_tree(hotlist_window), gwin); + ami_menu_arexx_scan(gwin); + gwin = ami_menu_layout(gwin); - GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); - if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; - - nsoption_set_bool(background_images, checked); - ami_menu_check_toggled = true; -} +#if defined(WITH_JS) || defined(WITH_MOZJS) + gwin->menu[M_JS].nm_Flags = CHECKIT | MENUTOGGLE; + if(nsoption_bool(enable_javascript) == true) + gwin->menu[M_JS].nm_Flags |= CHECKED; +#endif -static void ami_menu_item_browser_enablejs(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct Menu *menustrip; - bool checked = false; + gwin->menu[M_PRINT].nm_Flags = NM_ITEMDISABLED; + + gwin->menu[M_IMGFORE].nm_Flags = CHECKIT | MENUTOGGLE; + if(nsoption_bool(foreground_images) == true) + gwin->menu[M_IMGFORE].nm_Flags |= CHECKED; + gwin->menu[M_IMGBACK].nm_Flags = CHECKIT | MENUTOGGLE; + if(nsoption_bool(background_images) == true) + gwin->menu[M_IMGBACK].nm_Flags |= CHECKED; - GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); - if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; - - nsoption_set_bool(enable_javascript, checked); - ami_menu_check_toggled = true; + return(gwin->menu); } -static void ami_menu_item_browser_scale_decrease(struct Hook *hook, APTR window, struct IntuiMessage *msg) +void ami_menu_arexx_scan(struct gui_window_2 *gwin) { - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + int item = AMI_MENU_AREXX; + BPTR lock = 0; + UBYTE *buffer; + struct ExAllControl *ctrl; + char matchpatt[16]; + LONG cont; + struct ExAllData *ead; + char *menu_lab; - if(gwin->gw->scale > 0.1) - ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1); -} + if((lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))) { + if((buffer = AllocVecTagList(1024, NULL))) { + if((ctrl = AllocDosObject(DOS_EXALLCONTROL,NULL))) { + ctrl->eac_LastKey = 0; -static void ami_menu_item_browser_scale_normal(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + if(ParsePatternNoCase("#?.nsrx",(char *)&matchpatt,16) != -1) { + ctrl->eac_MatchString = (char *)&matchpatt; + } - ami_gui_set_scale(gwin->gw, 1.0); -} + do { + cont = ExAll(lock,(struct ExAllData *)buffer,1024,ED_COMMENT,ctrl); + if((!cont) && (IoErr() != ERROR_NO_MORE_ENTRIES)) break; + if(!ctrl->eac_Entries) continue; -static void ami_menu_item_browser_scale_increase(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + for(ead = (struct ExAllData *)buffer; ead; ead = ead->ed_Next) { + if(item >= AMI_MENU_AREXX_MAX) continue; + if(EAD_IS_FILE(ead)) { + gwin->menu[item].nm_Type = NM_ITEM; + if(ead->ed_Comment[0] != '\0') + menu_lab = ead->ed_Comment; + else + menu_lab = ead->ed_Name; - ami_gui_set_scale(gwin->gw, gwin->gw->scale + 0.1); -} + ami_menu_alloc_item(gwin, item, NM_ITEM, menu_lab, 0, NULL, + ami_menu_item_arexx_entries, (void *)strdup(ead->ed_Name)); -static void ami_menu_item_browser_redraw(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + item++; + } + } + } while(cont); + FreeDosObject(DOS_EXALLCONTROL,ctrl); + } + FreeVec(buffer); + } + UnLock(lock); + } - ami_schedule_redraw(gwin, true); - gwin->new_content = true; + gwin->menu[item].nm_Type = NM_END; + gwin->menu[item].nm_Label = NULL; } -static void ami_menu_item_hotlist_add(struct Hook *hook, APTR window, struct IntuiMessage *msg) +static bool ami_menu_hotlist_add(void *userdata, int level, int item, const char *title, nsurl *url, bool is_folder) { - struct browser_window *bw; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + UBYTE type; + STRPTR icon; + struct gui_window_2 *gw = (struct gui_window_2 *)userdata; + + if(item >= AMI_MENU_HOTLIST_MAX) return false; + + switch(level) { + case 1: + type = NM_ITEM; + break; + case 2: + type = NM_SUB; + break; + default: + /* entries not at level 1 or 2 are not able to be added + * \todo apparently this is possible with 4.1FE, need SDK! */ + return false; + break; + } - bw = gwin->gw->bw; + if(is_folder == true) { + icon = ASPrintf("icons/directory.png"); + } else { + icon = ami_gui_get_cache_favicon_name(url, true); + if (icon == NULL) icon = ASPrintf("icons/content.png"); + } - if (bw == NULL || browser_window_has_content(bw) == false) - return; + ami_menu_alloc_item(gw, item, type, title, + 0, icon, ami_menu_item_hotlist_entries, (void *)url); + if((is_folder == true) && (type == NM_SUB)) + gw->menu[item].nm_Flags = NM_ITEMDISABLED; - hotlist_add_url(browser_window_get_url(bw)); - ami_gui_update_hotlist_button(gwin); + if(icon) FreeVec(icon); + + return true; } -static void ami_menu_item_hotlist_show(struct Hook *hook, APTR window, struct IntuiMessage *msg) +static nserror ami_menu_scan(struct tree *tree, struct gui_window_2 *gwin) { - ami_tree_open(hotlist_window, AMI_TREE_HOTLIST); + return ami_hotlist_scan((void *)gwin, AMI_MENU_HOTLIST, messages_get("HotlistMenu"), ami_menu_hotlist_add); } -static void ami_menu_item_hotlist_entries(struct Hook *hook, APTR window, struct IntuiMessage *msg) +void ami_menu_update_checked(struct gui_window_2 *gwin) { - nsurl *url = hook->h_Data; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + struct Menu *menustrip; - if(url == NULL) return; + GetAttr(WINDOW_MenuStrip, gwin->objects[OID_MAIN], (ULONG *)&menustrip); + if(!menustrip) return; +#if defined(WITH_JS) || defined(WITH_MOZJS) + if(nsoption_bool(enable_javascript) == true) { + if((ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED) == 0) + ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED; + } else { + if(ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED) + ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED; + } +#endif + if(nsoption_bool(foreground_images) == true) { + if((ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags & CHECKED) == 0) + ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags ^= CHECKED; + } else { + if(ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags & CHECKED) + ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags ^= CHECKED; + } - browser_window_navigate(gwin->gw->bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); -} + if(nsoption_bool(background_images) == true) { + if((ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags & CHECKED) == 0) + ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags ^= CHECKED; + } else { + if(ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags & CHECKED) + ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags ^= CHECKED; + } -static void ami_menu_item_settings_edit(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - ami_gui_opts_open(); + ResetMenuStrip(gwin->win, menustrip); } -static void ami_menu_item_settings_snapshot(struct Hook *hook, APTR window, struct IntuiMessage *msg) +void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c) { - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + struct Window *win = g->shared->win; - nsoption_set_int(window_x, gwin->win->LeftEdge); - nsoption_set_int(window_y, gwin->win->TopEdge); - nsoption_set_int(window_width, gwin->win->Width); - nsoption_set_int(window_height, gwin->win->Height); -} + if(nsoption_bool(kiosk_mode) == true) return; -static void ami_menu_item_settings_save(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - nsoption_write(current_user_options, NULL, NULL); -} + if(content_get_type(c) <= CONTENT_CSS) + { + OnMenu(win,AMI_MENU_SAVEAS_TEXT); + OnMenu(win,AMI_MENU_SAVEAS_COMPLETE); +#ifdef WITH_PDF_EXPORT + OnMenu(win,AMI_MENU_SAVEAS_PDF); +#endif + if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_COPY) + { + OnMenu(win,AMI_MENU_COPY); + OnMenu(win,AMI_MENU_CLEAR); + } else { + OffMenu(win,AMI_MENU_COPY); + OffMenu(win,AMI_MENU_CLEAR); + } -static void ami_menu_item_arexx_execute(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - char *temp; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_CUT) + OnMenu(win,AMI_MENU_CUT); + else + OffMenu(win,AMI_MENU_CUT); + + if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_PASTE) + OnMenu(win,AMI_MENU_PASTE); + else + OffMenu(win,AMI_MENU_PASTE); - if(AslRequestTags(filereq, - ASLFR_Window, gwin->win, - ASLFR_SleepWindow, TRUE, - ASLFR_TitleText, messages_get("NetSurf"), - ASLFR_Screen, scrn, - ASLFR_DoSaveMode, FALSE, - ASLFR_InitialDrawer, nsoption_charp(arexx_dir), - ASLFR_InitialPattern, "#?.nsrx", - TAG_DONE)) { - if((temp = AllocVecTagList(1024, NULL))) { - strlcpy(temp, filereq->fr_Drawer, 1024); - AddPart(temp, filereq->fr_File, 1024); - ami_arexx_execute(temp); - FreeVec(temp); - } + OnMenu(win,AMI_MENU_SELECTALL); + OnMenu(win,AMI_MENU_FIND); + OffMenu(win,AMI_MENU_SAVEAS_IFF); } -} + else + { + OffMenu(win,AMI_MENU_CUT); + OffMenu(win,AMI_MENU_PASTE); + OffMenu(win,AMI_MENU_CLEAR); -static void ami_menu_item_arexx_entries(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - char *script = hook->h_Data; - char *temp; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + OffMenu(win,AMI_MENU_SAVEAS_TEXT); + OffMenu(win,AMI_MENU_SAVEAS_COMPLETE); +#ifdef WITH_PDF_EXPORT + OffMenu(win,AMI_MENU_SAVEAS_PDF); +#endif + OffMenu(win,AMI_MENU_SELECTALL); + OffMenu(win,AMI_MENU_FIND); - if(script) { - if((temp = AllocVecTagList(1024, NULL))) { - BPTR lock; - if((lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))) { - DevNameFromLock(lock, temp, 1024, DN_FULLPATH); - AddPart(temp, script, 1024); - ami_arexx_execute(temp); - FreeVec(temp); - UnLock(lock); - } +#ifdef WITH_NS_SVG + if(content_get_bitmap(c) || (ami_mime_compare(c, "svg") == true)) +#else + if(content_get_bitmap(c)) +#endif + { + OnMenu(win,AMI_MENU_COPY); + OnMenu(win,AMI_MENU_SAVEAS_IFF); + } + else + { + OffMenu(win,AMI_MENU_COPY); + OffMenu(win,AMI_MENU_SAVEAS_IFF); } } } diff --git a/amiga/options.h b/amiga/options.h index 868e28f..b942420 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -63,6 +63,7 @@ NSOPTION_STRING(font_unicode, NULL) NSOPTION_STRING(font_unicode_file, NULL) NSOPTION_BOOL(font_unicode_only, false) NSOPTION_BOOL(font_antialiasing, true) +NSOPTION_BOOL(use_diskfont, false) NSOPTION_BOOL(drag_save_icons, true) NSOPTION_INTEGER(hotlist_window_xpos, 0) NSOPTION_INTEGER(hotlist_window_ypos, 0) diff --git a/amiga/plotters.c b/amiga/plotters.c index 443077b..660dea7 100644 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -414,7 +414,7 @@ static bool ami_text(int x, int y, const char *text, size_t length, aa = false; ami_plot_setapen(glob->rp, fstyle->foreground); - ami_unicode_text(glob->rp, text, length, fstyle, x, y, aa); + ami_font_unicode_text(glob->rp, text, length, fstyle, x, y, aa); return true; } diff --git a/amiga/tree.c b/amiga/tree.c index 4f2c286..cba5375 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -524,7 +524,7 @@ static void ami_tree_drag_end(struct treeview_window *twin, int x, int y) } } -static void ami_tree_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg) +HOOKF(void, ami_tree_scroller_hook, Object *, object, struct IntuiMessage *) { ULONG gid; struct treeview_window *twin = hook->h_Data; -- NetSurf Browser

8 years, 1 month

1
0
0 / 0

netsurf: branch chris/bitmap-fonts updated. release/3.2-731-g947c466

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/947c466c4ba63ad84c012... ...commit http://git.netsurf-browser.org/netsurf.git/commit/947c466c4ba63ad84c01214... ...tree http://git.netsurf-browser.org/netsurf.git/tree/947c466c4ba63ad84c0121453... The branch, chris/bitmap-fonts has been updated via 947c466c4ba63ad84c0121453975a34935d0c1e8 (commit) via df25135a4d2007510b03487b517dad13b23f1a98 (commit) from 5f72dd2f0f97222c8abf41b7ed06c7673aa2e532 (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/commit/?id=947c466c4ba63ad84c0... commit 947c466c4ba63ad84c0121453975a34935d0c1e8 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Split plotting and widthing functions up diff --git a/amiga/font.c b/amiga/font.c index 1f3269e..32f12f2 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -152,20 +152,21 @@ lwc_string *glypharray[0xffff + 1]; ULONG ami_devicedpi; ULONG ami_xdpi; -static int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, +static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, uint16 *char1, uint16 *char2, uint32 x, uint32 y, uint32 emwidth, bool aa); -static int32 ami_font_width_glyph(struct OutlineFont *ofont, +static inline int32 ami_font_width_glyph(struct OutlineFont *ofont, const uint16 *char1, const uint16 *char2, uint32 emwidth); static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, const uint16 *codepoint); static void ami_font_cleanup(struct MinList *ami_font_list); - +static inline ULONG ami_font_unicode_width(const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG x, ULONG y, bool aa); static inline bool amiga_nsfont_width(const plot_font_style_t *fstyle, const char *string, size_t length, int *width) { - *width = ami_unicode_text(NULL, string, length, fstyle, 0, 0, false); + *width = ami_font_unicode_width(string, length, fstyle, 0, 0, false); if(*width <= 0) *width == length; // fudge @@ -719,7 +720,7 @@ static const uint16 *ami_font_translate_smallcaps(uint16 *utf16char) return utf16char; } -ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, +ULONG ami_font_unicode_text(struct RastPort *rp, const char *string, ULONG length, const plot_font_style_t *fstyle, ULONG dx, ULONG dy, bool aa) { uint16 *utf16 = NULL, *outf16 = NULL; @@ -733,6 +734,7 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, if(!string || string[0]=='\0') return 0; if(!length) return 0; + if(rp == NULL) return 0; if(__builtin_expect(nsoption_bool(use_diskfont) == true, 0)) { return ami_font_bm_text(rp, string, length, fstyle, dx, dy); @@ -756,22 +758,14 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, utf16charsc = (uint16 *)ami_font_translate_smallcaps(utf16); utf16nextsc = (uint16 *)ami_font_translate_smallcaps(utf16next); - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, utf16charsc, utf16nextsc, + tempx = ami_font_plot_glyph(ofont, rp, utf16charsc, utf16nextsc, dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, utf16charsc, utf16nextsc, emwidth); - } } else tempx = 0; if(tempx == 0) { - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, utf16, utf16next, + tempx = ami_font_plot_glyph(ofont, rp, utf16, utf16next, dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, utf16, utf16next, emwidth); - } } if(tempx == 0) @@ -781,26 +775,73 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, ufont = ami_open_outline_font(fstyle, utf16); } - if(ufont) + if(ufont) { + tempx = ami_font_plot_glyph(ufont, rp, utf16, utf16next, + dx + x, dy, emwidth, aa); + } + } + + x += tempx; + + utf16 += utf16charlen; + } + + free(outf16); + return x; +} + +static inline ULONG ami_font_unicode_width(const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG dx, ULONG dy, bool aa) +{ + uint16 *utf16 = NULL, *outf16 = NULL; + uint16 *utf16charsc = 0, *utf16nextsc = 0; + uint16 *utf16next = 0; + int utf16charlen; + struct OutlineFont *ofont, *ufont = NULL; + uint32 x=0; + int32 tempx = 0; + ULONG emwidth = (ULONG)NSA_FONT_EMWIDTH(fstyle->size); + + if(!string || string[0]=='\0') return 0; + if(!length) return 0; + + if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != NSERROR_OK) return 0; + outf16 = utf16; + if(!(ofont = ami_open_outline_font(fstyle, 0))) return 0; + + while(*utf16 != 0) + { + if ((*utf16 < 0xD800) || (0xDBFF < *utf16)) + utf16charlen = 1; + else + utf16charlen = 2; + + utf16next = &utf16[utf16charlen]; + + if(fstyle->flags & FONTF_SMALLCAPS) + { + utf16charsc = (uint16 *)ami_font_translate_smallcaps(utf16); + utf16nextsc = (uint16 *)ami_font_translate_smallcaps(utf16next); + + tempx = ami_font_width_glyph(ofont, utf16charsc, utf16nextsc, emwidth); + } + else tempx = 0; + + if(tempx == 0) { + tempx = ami_font_width_glyph(ofont, utf16, utf16next, emwidth); + } + + if(tempx == 0) + { + if(ufont == NULL) { - if(rp) { - tempx = ami_font_plot_glyph(ufont, rp, utf16, utf16next, - dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ufont, utf16, utf16next, emwidth); - } + ufont = ami_open_outline_font(fstyle, utf16); } -/* - if(tempx == 0) + + if(ufont) { - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, 0xfffd, utf16next, - dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, 0xfffd, utf16next, emwidth); - } + tempx = ami_font_width_glyph(ufont, utf16, utf16next, emwidth); } -*/ } x += tempx; diff --git a/amiga/font.h b/amiga/font.h index 6c600ab..375e150 100755 --- a/amiga/font.h +++ b/amiga/font.h @@ -25,7 +25,7 @@ struct ami_font_node; -ULONG ami_unicode_text(struct RastPort *rp, const char *string, +ULONG ami_font_unicode_text(struct RastPort *rp, const char *string, ULONG length, const plot_font_style_t *fstyle, ULONG x, ULONG y, bool aa); void ami_font_setdevicedpi(int id); void ami_init_fonts(void); diff --git a/amiga/plotters.c b/amiga/plotters.c index 443077b..660dea7 100644 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -414,7 +414,7 @@ static bool ami_text(int x, int y, const char *text, size_t length, aa = false; ami_plot_setapen(glob->rp, fstyle->foreground); - ami_unicode_text(glob->rp, text, length, fstyle, x, y, aa); + ami_font_unicode_text(glob->rp, text, length, fstyle, x, y, aa); return true; } commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=df25135a4d2007510b0... commit df25135a4d2007510b03487b517dad13b23f1a98 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> micro-optimisation diff --git a/amiga/font.c b/amiga/font.c index f930f77..1f3269e 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -549,7 +549,7 @@ static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle return NULL; } -static int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, +static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, uint16 *char1, uint16 *char2, uint32 x, uint32 y, uint32 emwidth, bool aa) { struct GlyphMap *glyph; @@ -562,12 +562,12 @@ static int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, struct BulletBase *BulletBase = ofont->BulletBase; #endif - if ((*char1 >= 0xD800) && (*char1 <= 0xDBFF)) { + if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) { /* We don't support UTF-16 surrogates yet, so just return. */ return 0; } - if ((*char2 >= 0xD800) && (*char2 <= 0xDBFF)) { + if (__builtin_expect(((*char2 >= 0xD800) && (*char2 <= 0xDBFF)), 0)) { /* Don't attempt to kern a UTF-16 surrogate */ *char2 = 0; } @@ -640,7 +640,7 @@ static int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, return char_advance; } -static int32 ami_font_width_glyph(struct OutlineFont *ofont, +static inline int32 ami_font_width_glyph(struct OutlineFont *ofont, const uint16 *char1, const uint16 *char2, uint32 emwidth) { int32 char_advance = 0; @@ -653,12 +653,12 @@ static int32 ami_font_width_glyph(struct OutlineFont *ofont, struct BulletBase *BulletBase = ofont->BulletBase; #endif - if ((*char1 >= 0xD800) && (*char1 <= 0xDBFF)) { + if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) { /* We don't support UTF-16 surrogates yet, so just return. */ return 0; } - - if ((*char2 >= 0xD800) && (*char2 <= 0xDBFF)) { + + if (__builtin_expect(((*char2 >= 0xD800) && (*char2 <= 0xDBFF)), 0)) { /* Don't attempt to kern a UTF-16 surrogate */ skip_c2 = true; } diff --git a/amiga/font_bitmap.c b/amiga/font_bitmap.c index 0b5b7ce..8f142ae 100644 --- a/amiga/font_bitmap.c +++ b/amiga/font_bitmap.c @@ -202,11 +202,12 @@ bool amiga_bm_nsfont_split(const plot_font_style_t *fstyle, co--; } - *char_offset = co; - if(string && co) { + if(co > 0) { *actual_x = TextLength(glob->rp, string, co); + *char_offset = co; } else { - *actual_x = 0; + *actual_x = x; + *char_offset = length; } ami_font_bm_close(bmfont); ----------------------------------------------------------------------- Summary of changes: amiga/font.c | 117 ++++++++++++++++++++++++++++++++++----------------- amiga/font.h | 2 +- amiga/font_bitmap.c | 7 +-- amiga/plotters.c | 2 +- 4 files changed, 85 insertions(+), 43 deletions(-) diff --git a/amiga/font.c b/amiga/font.c index f930f77..32f12f2 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -152,20 +152,21 @@ lwc_string *glypharray[0xffff + 1]; ULONG ami_devicedpi; ULONG ami_xdpi; -static int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, +static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, uint16 *char1, uint16 *char2, uint32 x, uint32 y, uint32 emwidth, bool aa); -static int32 ami_font_width_glyph(struct OutlineFont *ofont, +static inline int32 ami_font_width_glyph(struct OutlineFont *ofont, const uint16 *char1, const uint16 *char2, uint32 emwidth); static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, const uint16 *codepoint); static void ami_font_cleanup(struct MinList *ami_font_list); - +static inline ULONG ami_font_unicode_width(const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG x, ULONG y, bool aa); static inline bool amiga_nsfont_width(const plot_font_style_t *fstyle, const char *string, size_t length, int *width) { - *width = ami_unicode_text(NULL, string, length, fstyle, 0, 0, false); + *width = ami_font_unicode_width(string, length, fstyle, 0, 0, false); if(*width <= 0) *width == length; // fudge @@ -549,7 +550,7 @@ static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle return NULL; } -static int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, +static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, uint16 *char1, uint16 *char2, uint32 x, uint32 y, uint32 emwidth, bool aa) { struct GlyphMap *glyph; @@ -562,12 +563,12 @@ static int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, struct BulletBase *BulletBase = ofont->BulletBase; #endif - if ((*char1 >= 0xD800) && (*char1 <= 0xDBFF)) { + if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) { /* We don't support UTF-16 surrogates yet, so just return. */ return 0; } - if ((*char2 >= 0xD800) && (*char2 <= 0xDBFF)) { + if (__builtin_expect(((*char2 >= 0xD800) && (*char2 <= 0xDBFF)), 0)) { /* Don't attempt to kern a UTF-16 surrogate */ *char2 = 0; } @@ -640,7 +641,7 @@ static int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, return char_advance; } -static int32 ami_font_width_glyph(struct OutlineFont *ofont, +static inline int32 ami_font_width_glyph(struct OutlineFont *ofont, const uint16 *char1, const uint16 *char2, uint32 emwidth) { int32 char_advance = 0; @@ -653,12 +654,12 @@ static int32 ami_font_width_glyph(struct OutlineFont *ofont, struct BulletBase *BulletBase = ofont->BulletBase; #endif - if ((*char1 >= 0xD800) && (*char1 <= 0xDBFF)) { + if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) { /* We don't support UTF-16 surrogates yet, so just return. */ return 0; } - - if ((*char2 >= 0xD800) && (*char2 <= 0xDBFF)) { + + if (__builtin_expect(((*char2 >= 0xD800) && (*char2 <= 0xDBFF)), 0)) { /* Don't attempt to kern a UTF-16 surrogate */ skip_c2 = true; } @@ -719,7 +720,7 @@ static const uint16 *ami_font_translate_smallcaps(uint16 *utf16char) return utf16char; } -ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, +ULONG ami_font_unicode_text(struct RastPort *rp, const char *string, ULONG length, const plot_font_style_t *fstyle, ULONG dx, ULONG dy, bool aa) { uint16 *utf16 = NULL, *outf16 = NULL; @@ -733,6 +734,7 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, if(!string || string[0]=='\0') return 0; if(!length) return 0; + if(rp == NULL) return 0; if(__builtin_expect(nsoption_bool(use_diskfont) == true, 0)) { return ami_font_bm_text(rp, string, length, fstyle, dx, dy); @@ -756,22 +758,14 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, utf16charsc = (uint16 *)ami_font_translate_smallcaps(utf16); utf16nextsc = (uint16 *)ami_font_translate_smallcaps(utf16next); - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, utf16charsc, utf16nextsc, + tempx = ami_font_plot_glyph(ofont, rp, utf16charsc, utf16nextsc, dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, utf16charsc, utf16nextsc, emwidth); - } } else tempx = 0; if(tempx == 0) { - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, utf16, utf16next, + tempx = ami_font_plot_glyph(ofont, rp, utf16, utf16next, dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, utf16, utf16next, emwidth); - } } if(tempx == 0) @@ -781,26 +775,73 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, ufont = ami_open_outline_font(fstyle, utf16); } - if(ufont) + if(ufont) { + tempx = ami_font_plot_glyph(ufont, rp, utf16, utf16next, + dx + x, dy, emwidth, aa); + } + } + + x += tempx; + + utf16 += utf16charlen; + } + + free(outf16); + return x; +} + +static inline ULONG ami_font_unicode_width(const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG dx, ULONG dy, bool aa) +{ + uint16 *utf16 = NULL, *outf16 = NULL; + uint16 *utf16charsc = 0, *utf16nextsc = 0; + uint16 *utf16next = 0; + int utf16charlen; + struct OutlineFont *ofont, *ufont = NULL; + uint32 x=0; + int32 tempx = 0; + ULONG emwidth = (ULONG)NSA_FONT_EMWIDTH(fstyle->size); + + if(!string || string[0]=='\0') return 0; + if(!length) return 0; + + if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != NSERROR_OK) return 0; + outf16 = utf16; + if(!(ofont = ami_open_outline_font(fstyle, 0))) return 0; + + while(*utf16 != 0) + { + if ((*utf16 < 0xD800) || (0xDBFF < *utf16)) + utf16charlen = 1; + else + utf16charlen = 2; + + utf16next = &utf16[utf16charlen]; + + if(fstyle->flags & FONTF_SMALLCAPS) + { + utf16charsc = (uint16 *)ami_font_translate_smallcaps(utf16); + utf16nextsc = (uint16 *)ami_font_translate_smallcaps(utf16next); + + tempx = ami_font_width_glyph(ofont, utf16charsc, utf16nextsc, emwidth); + } + else tempx = 0; + + if(tempx == 0) { + tempx = ami_font_width_glyph(ofont, utf16, utf16next, emwidth); + } + + if(tempx == 0) + { + if(ufont == NULL) { - if(rp) { - tempx = ami_font_plot_glyph(ufont, rp, utf16, utf16next, - dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ufont, utf16, utf16next, emwidth); - } + ufont = ami_open_outline_font(fstyle, utf16); } -/* - if(tempx == 0) + + if(ufont) { - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, 0xfffd, utf16next, - dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, 0xfffd, utf16next, emwidth); - } + tempx = ami_font_width_glyph(ufont, utf16, utf16next, emwidth); } -*/ } x += tempx; diff --git a/amiga/font.h b/amiga/font.h index 6c600ab..375e150 100755 --- a/amiga/font.h +++ b/amiga/font.h @@ -25,7 +25,7 @@ struct ami_font_node; -ULONG ami_unicode_text(struct RastPort *rp, const char *string, +ULONG ami_font_unicode_text(struct RastPort *rp, const char *string, ULONG length, const plot_font_style_t *fstyle, ULONG x, ULONG y, bool aa); void ami_font_setdevicedpi(int id); void ami_init_fonts(void); diff --git a/amiga/font_bitmap.c b/amiga/font_bitmap.c index 0b5b7ce..8f142ae 100644 --- a/amiga/font_bitmap.c +++ b/amiga/font_bitmap.c @@ -202,11 +202,12 @@ bool amiga_bm_nsfont_split(const plot_font_style_t *fstyle, co--; } - *char_offset = co; - if(string && co) { + if(co > 0) { *actual_x = TextLength(glob->rp, string, co); + *char_offset = co; } else { - *actual_x = 0; + *actual_x = x; + *char_offset = length; } ami_font_bm_close(bmfont); diff --git a/amiga/plotters.c b/amiga/plotters.c index 443077b..660dea7 100644 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -414,7 +414,7 @@ static bool ami_text(int x, int y, const char *text, size_t length, aa = false; ami_plot_setapen(glob->rp, fstyle->foreground); - ami_unicode_text(glob->rp, text, length, fstyle, x, y, aa); + ami_font_unicode_text(glob->rp, text, length, fstyle, x, y, aa); return true; } -- NetSurf Browser

8 years, 1 month

1
0
0 / 0

libcss: branch master updated. release/0.4.0-78-g4d68be5

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libcss.git/shortlog/4d68be5215e135952c76be... ...commit http://git.netsurf-browser.org/libcss.git/commit/4d68be5215e135952c76be39... ...tree http://git.netsurf-browser.org/libcss.git/tree/4d68be5215e135952c76be3986... The branch, master has been updated via 4d68be5215e135952c76be398623ba301d77fc00 (commit) from 1e421499904495d7d815b996fd7db734c9231913 (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/libcss.git/commit/?id=4d68be5215e135952c76... commit 4d68be5215e135952c76be398623ba301d77fc00 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Simplify length absolutification. Prevents harmless "Conditional jump or move depends on uninitialised value(s)" in case of properties set to "normal". Now we only absolutify EX values if the there is a value set. diff --git a/src/select/computed.c b/src/select/computed.c index c94a5c2..dc632f9 100644 --- a/src/select/computed.c +++ b/src/select/computed.c @@ -46,18 +46,6 @@ static css_error compute_absolute_length(css_computed_style *style, css_fixed *len, css_unit *unit), css_error (*set)(css_computed_style *style, uint8_t type, css_fixed len, css_unit unit)); -static css_error compute_absolute_length_auto(css_computed_style *style, - const css_hint_length *ex_size, - uint8_t (*get)(const css_computed_style *style, - css_fixed *len, css_unit *unit), - css_error (*set)(css_computed_style *style, uint8_t type, - css_fixed len, css_unit unit)); -static css_error compute_absolute_length_none(css_computed_style *style, - const css_hint_length *ex_size, - uint8_t (*get)(const css_computed_style *style, - css_fixed *len, css_unit *unit), - css_error (*set)(css_computed_style *style, uint8_t type, - css_fixed len, css_unit unit)); static css_error compute_absolute_length_pair(css_computed_style *style, const css_hint_length *ex_size, uint8_t (*get)(const css_computed_style *style, @@ -1094,7 +1082,7 @@ css_error css__compute_absolute_values(const css_computed_style *parent, return error; /* Fix up height */ - error = compute_absolute_length_auto(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_height, set_height); if (error != CSS_OK) return error; @@ -1110,25 +1098,25 @@ css_error css__compute_absolute_values(const css_computed_style *parent, return error; /* Fix up max-height */ - error = compute_absolute_length_none(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_max_height, set_max_height); if (error != CSS_OK) return error; /* Fix up max-width */ - error = compute_absolute_length_none(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_max_width, set_max_width); if (error != CSS_OK) return error; /* Fix up min-height */ - error = compute_absolute_length(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_min_height, set_min_height); if (error != CSS_OK) return error; /* Fix up min-width */ - error = compute_absolute_length(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_min_width, set_min_width); if (error != CSS_OK) return error; @@ -1139,7 +1127,7 @@ css_error css__compute_absolute_values(const css_computed_style *parent, return error; /* Fix up text-indent */ - error = compute_absolute_length(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_text_indent, set_text_indent); if (error != CSS_OK) return error; @@ -1150,7 +1138,7 @@ css_error css__compute_absolute_values(const css_computed_style *parent, return error; /* Fix up width */ - error = compute_absolute_length_auto(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_width, set_width); if (error != CSS_OK) return error; @@ -1484,21 +1472,22 @@ css_error compute_absolute_sides(css_computed_style *style, css_error error; /* Calculate absolute lengths for sides */ - error = compute_absolute_length_auto(style, ex_size, get_top, set_top); + error = compute_absolute_length(style, ex_size, + get_top, set_top); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_right, set_right); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_bottom, set_bottom); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_left, set_left); if (error != CSS_OK) return error; @@ -1518,22 +1507,22 @@ css_error compute_absolute_margins(css_computed_style *style, { css_error error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_margin_top, set_margin_top); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_margin_right, set_margin_right); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_margin_bottom, set_margin_bottom); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_margin_left, set_margin_left); if (error != CSS_OK) return error; @@ -1629,79 +1618,16 @@ css_error compute_absolute_length(css_computed_style *style, type = get(style, &length, &unit); - if (unit == CSS_UNIT_EX) { + if (type == CSS_WIDTH_SET && unit == CSS_UNIT_EX) { length = FMUL(length, ex_size->value); unit = ex_size->unit; - } - return set(style, type, length, unit); -} - -/** - * Compute the absolute value of length or auto - * - * \param style Style to process - * \param ex_size Ex size, in ems - * \param get Function to read length - * \param set Function to write length - * \return CSS_OK on success - */ -css_error compute_absolute_length_auto(css_computed_style *style, - const css_hint_length *ex_size, - uint8_t (*get)(const css_computed_style *style, - css_fixed *len, css_unit *unit), - css_error (*set)(css_computed_style *style, uint8_t type, - css_fixed len, css_unit unit)) -{ - css_fixed length; - css_unit unit; - uint8_t type; - - type = get(style, &length, &unit); - if (type != CSS_BOTTOM_AUTO) { - if (unit == CSS_UNIT_EX) { - length = FMUL(length, ex_size->value); - unit = ex_size->unit; - } - - return set(style, CSS_BOTTOM_SET, length, unit); + return set(style, type, length, unit); } - return set(style, CSS_BOTTOM_AUTO, 0, CSS_UNIT_PX); + return CSS_OK; } -/** - * Compute the absolute value of length or none - * - * \param style Style to process - * \param ex_size Ex size, in ems - * \param get Function to read length - * \param set Function to write length - * \return CSS_OK on success - */ -css_error compute_absolute_length_none(css_computed_style *style, - const css_hint_length *ex_size, - uint8_t (*get)(const css_computed_style *style, - css_fixed *len, css_unit *unit), - css_error (*set)(css_computed_style *style, uint8_t type, - css_fixed len, css_unit unit)) -{ - css_fixed length; - css_unit unit; - uint8_t type; - - type = get(style, &length, &unit); - if (type != CSS_MAX_HEIGHT_NONE) { - if (unit == CSS_UNIT_EX) { - length = FMUL(length, ex_size->value); - unit = ex_size->unit; - } - - return set(style, CSS_MAX_HEIGHT_SET, length, unit); - } - - return set(style, CSS_MAX_HEIGHT_NONE, 0, CSS_UNIT_PX); -} /** * Compute the absolute value of length pair ----------------------------------------------------------------------- Summary of changes: src/select/computed.c | 112 +++++++++---------------------------------------- 1 file changed, 19 insertions(+), 93 deletions(-) diff --git a/src/select/computed.c b/src/select/computed.c index c94a5c2..dc632f9 100644 --- a/src/select/computed.c +++ b/src/select/computed.c @@ -46,18 +46,6 @@ static css_error compute_absolute_length(css_computed_style *style, css_fixed *len, css_unit *unit), css_error (*set)(css_computed_style *style, uint8_t type, css_fixed len, css_unit unit)); -static css_error compute_absolute_length_auto(css_computed_style *style, - const css_hint_length *ex_size, - uint8_t (*get)(const css_computed_style *style, - css_fixed *len, css_unit *unit), - css_error (*set)(css_computed_style *style, uint8_t type, - css_fixed len, css_unit unit)); -static css_error compute_absolute_length_none(css_computed_style *style, - const css_hint_length *ex_size, - uint8_t (*get)(const css_computed_style *style, - css_fixed *len, css_unit *unit), - css_error (*set)(css_computed_style *style, uint8_t type, - css_fixed len, css_unit unit)); static css_error compute_absolute_length_pair(css_computed_style *style, const css_hint_length *ex_size, uint8_t (*get)(const css_computed_style *style, @@ -1094,7 +1082,7 @@ css_error css__compute_absolute_values(const css_computed_style *parent, return error; /* Fix up height */ - error = compute_absolute_length_auto(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_height, set_height); if (error != CSS_OK) return error; @@ -1110,25 +1098,25 @@ css_error css__compute_absolute_values(const css_computed_style *parent, return error; /* Fix up max-height */ - error = compute_absolute_length_none(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_max_height, set_max_height); if (error != CSS_OK) return error; /* Fix up max-width */ - error = compute_absolute_length_none(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_max_width, set_max_width); if (error != CSS_OK) return error; /* Fix up min-height */ - error = compute_absolute_length(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_min_height, set_min_height); if (error != CSS_OK) return error; /* Fix up min-width */ - error = compute_absolute_length(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_min_width, set_min_width); if (error != CSS_OK) return error; @@ -1139,7 +1127,7 @@ css_error css__compute_absolute_values(const css_computed_style *parent, return error; /* Fix up text-indent */ - error = compute_absolute_length(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_text_indent, set_text_indent); if (error != CSS_OK) return error; @@ -1150,7 +1138,7 @@ css_error css__compute_absolute_values(const css_computed_style *parent, return error; /* Fix up width */ - error = compute_absolute_length_auto(style, &ex_size.data.length, + error = compute_absolute_length(style, &ex_size.data.length, get_width, set_width); if (error != CSS_OK) return error; @@ -1484,21 +1472,22 @@ css_error compute_absolute_sides(css_computed_style *style, css_error error; /* Calculate absolute lengths for sides */ - error = compute_absolute_length_auto(style, ex_size, get_top, set_top); + error = compute_absolute_length(style, ex_size, + get_top, set_top); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_right, set_right); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_bottom, set_bottom); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_left, set_left); if (error != CSS_OK) return error; @@ -1518,22 +1507,22 @@ css_error compute_absolute_margins(css_computed_style *style, { css_error error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_margin_top, set_margin_top); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_margin_right, set_margin_right); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_margin_bottom, set_margin_bottom); if (error != CSS_OK) return error; - error = compute_absolute_length_auto(style, ex_size, + error = compute_absolute_length(style, ex_size, get_margin_left, set_margin_left); if (error != CSS_OK) return error; @@ -1629,79 +1618,16 @@ css_error compute_absolute_length(css_computed_style *style, type = get(style, &length, &unit); - if (unit == CSS_UNIT_EX) { + if (type == CSS_WIDTH_SET && unit == CSS_UNIT_EX) { length = FMUL(length, ex_size->value); unit = ex_size->unit; - } - return set(style, type, length, unit); -} - -/** - * Compute the absolute value of length or auto - * - * \param style Style to process - * \param ex_size Ex size, in ems - * \param get Function to read length - * \param set Function to write length - * \return CSS_OK on success - */ -css_error compute_absolute_length_auto(css_computed_style *style, - const css_hint_length *ex_size, - uint8_t (*get)(const css_computed_style *style, - css_fixed *len, css_unit *unit), - css_error (*set)(css_computed_style *style, uint8_t type, - css_fixed len, css_unit unit)) -{ - css_fixed length; - css_unit unit; - uint8_t type; - - type = get(style, &length, &unit); - if (type != CSS_BOTTOM_AUTO) { - if (unit == CSS_UNIT_EX) { - length = FMUL(length, ex_size->value); - unit = ex_size->unit; - } - - return set(style, CSS_BOTTOM_SET, length, unit); + return set(style, type, length, unit); } - return set(style, CSS_BOTTOM_AUTO, 0, CSS_UNIT_PX); + return CSS_OK; } -/** - * Compute the absolute value of length or none - * - * \param style Style to process - * \param ex_size Ex size, in ems - * \param get Function to read length - * \param set Function to write length - * \return CSS_OK on success - */ -css_error compute_absolute_length_none(css_computed_style *style, - const css_hint_length *ex_size, - uint8_t (*get)(const css_computed_style *style, - css_fixed *len, css_unit *unit), - css_error (*set)(css_computed_style *style, uint8_t type, - css_fixed len, css_unit unit)) -{ - css_fixed length; - css_unit unit; - uint8_t type; - - type = get(style, &length, &unit); - if (type != CSS_MAX_HEIGHT_NONE) { - if (unit == CSS_UNIT_EX) { - length = FMUL(length, ex_size->value); - unit = ex_size->unit; - } - - return set(style, CSS_MAX_HEIGHT_SET, length, unit); - } - - return set(style, CSS_MAX_HEIGHT_NONE, 0, CSS_UNIT_PX); -} /** * Compute the absolute value of length pair -- Cascading Style Sheets library

8 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.2-726-g2ce332f

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/2ce332f1b07af89ce387c... ...commit http://git.netsurf-browser.org/netsurf.git/commit/2ce332f1b07af89ce387ca2... ...tree http://git.netsurf-browser.org/netsurf.git/tree/2ce332f1b07af89ce387ca24c... The branch, master has been updated via 2ce332f1b07af89ce387ca24cc6471f97c80154b (commit) from 62c14f8b7362f76b5bf1390338bcc750e7019cb4 (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/commit/?id=2ce332f1b07af89ce38... commit 2ce332f1b07af89ce387ca24cc6471f97c80154b Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove nsurl include. diff --git a/render/imagemap.h b/render/imagemap.h index d450cda..3ae6819 100644 --- a/render/imagemap.h +++ b/render/imagemap.h @@ -21,16 +21,15 @@ #include <dom/dom.h> -#include "utils/nsurl.h" - struct html_content; struct hlcache_handle; +struct nsurl; void imagemap_destroy(struct html_content *c); void imagemap_dump(struct html_content *c); nserror imagemap_extract(struct html_content *c); -nsurl *imagemap_get(struct html_content *c, const char *key, +struct nsurl *imagemap_get(struct html_content *c, const char *key, unsigned long x, unsigned long y, unsigned long click_x, unsigned long click_y, const char **target); ----------------------------------------------------------------------- Summary of changes: render/imagemap.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/render/imagemap.h b/render/imagemap.h index d450cda..3ae6819 100644 --- a/render/imagemap.h +++ b/render/imagemap.h @@ -21,16 +21,15 @@ #include <dom/dom.h> -#include "utils/nsurl.h" - struct html_content; struct hlcache_handle; +struct nsurl; void imagemap_destroy(struct html_content *c); void imagemap_dump(struct html_content *c); nserror imagemap_extract(struct html_content *c); -nsurl *imagemap_get(struct html_content *c, const char *key, +struct nsurl *imagemap_get(struct html_content *c, const char *key, unsigned long x, unsigned long y, unsigned long click_x, unsigned long click_y, const char **target); -- NetSurf Browser

8 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.2-725-g62c14f8

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/62c14f8b7362f76b5bf13... ...commit http://git.netsurf-browser.org/netsurf.git/commit/62c14f8b7362f76b5bf1390... ...tree http://git.netsurf-browser.org/netsurf.git/tree/62c14f8b7362f76b5bf139033... The branch, master has been updated via 62c14f8b7362f76b5bf1390338bcc750e7019cb4 (commit) via ac636100e8d87a9e0080a258d90f1622bd1e5b8b (commit) from 4402bcf779973bbefc264e125010ab51d08de9b4 (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/commit/?id=62c14f8b7362f76b5bf... commit 62c14f8b7362f76b5bf1390338bcc750e7019cb4 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove include of nsurl.h diff --git a/css/select.h b/css/select.h index 083fd91..13b9e12 100644 --- a/css/select.h +++ b/css/select.h @@ -24,9 +24,9 @@ #include <dom/dom.h> #include "css/css.h" -#include "utils/nsurl.h" struct content; +struct nsurl; /** * Selection context @@ -35,7 +35,7 @@ typedef struct nscss_select_ctx { css_select_ctx *ctx; bool quirks; - nsurl *base_url; + struct nsurl *base_url; lwc_string *universal; const css_computed_style *parent_style; } nscss_select_ctx; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ac636100e8d87a9e008... commit ac636100e8d87a9e0080a258d90f1622bd1e5b8b Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Remove include of nsurl from corestrings.h diff --git a/content/dirlist.h b/content/dirlist.h index 687f506..5cdaf75 100644 --- a/content/dirlist.h +++ b/content/dirlist.h @@ -33,15 +33,17 @@ #define DIRLIST_NO_DATE_COLUMN 1 << 3 #define DIRLIST_NO_TIME_COLUMN 1 << 4 +struct nsurl; + bool dirlist_generate_top(char *buffer, int buffer_length); bool dirlist_generate_hide_columns(int flags, char *buffer, int buffer_length); bool dirlist_generate_title(const char *title, char *buffer, int buffer_length); bool dirlist_generate_parent_link(const char *parent, char *buffer, int buffer_length); bool dirlist_generate_headings(char *buffer, int buffer_length); -bool dirlist_generate_row(bool even, bool directory, nsurl *url, char *name, - const char *mimetype, long long size, char *date, char *time, - char *buffer, int buffer_length); +bool dirlist_generate_row(bool even, bool directory, struct nsurl *url, + char *name, const char *mimetype, long long size, char *date, + char *time, char *buffer, int buffer_length); bool dirlist_generate_bottom(char *buffer, int buffer_length); #endif diff --git a/utils/corestrings.c b/utils/corestrings.c index 0f9c4d6..6e52a1b 100644 --- a/utils/corestrings.c +++ b/utils/corestrings.c @@ -23,6 +23,7 @@ #include <dom/dom.h> #include "utils/corestrings.h" +#include "utils/nsurl.h" #include "utils/utils.h" /* lwc_string strings */ diff --git a/utils/corestrings.h b/utils/corestrings.h index b558529..d51e11c 100644 --- a/utils/corestrings.h +++ b/utils/corestrings.h @@ -24,7 +24,6 @@ #define NETSURF_UTILS_CORESTRINGS_H_ #include <libwapcaplet/libwapcaplet.h> -#include "utils/nsurl.h" #include "utils/errors.h" /** File url prefix. */ @@ -289,6 +288,6 @@ extern struct dom_string *corestring_dom___ns_key_file_name_node_data; extern struct dom_string *corestring_dom___ns_key_image_coords_node_data; /* URLs */ -extern nsurl *corestring_nsurl_about_blank; +extern struct nsurl *corestring_nsurl_about_blank; #endif ----------------------------------------------------------------------- Summary of changes: content/dirlist.h | 8 +++++--- css/select.h | 4 ++-- utils/corestrings.c | 1 + utils/corestrings.h | 3 +-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/content/dirlist.h b/content/dirlist.h index 687f506..5cdaf75 100644 --- a/content/dirlist.h +++ b/content/dirlist.h @@ -33,15 +33,17 @@ #define DIRLIST_NO_DATE_COLUMN 1 << 3 #define DIRLIST_NO_TIME_COLUMN 1 << 4 +struct nsurl; + bool dirlist_generate_top(char *buffer, int buffer_length); bool dirlist_generate_hide_columns(int flags, char *buffer, int buffer_length); bool dirlist_generate_title(const char *title, char *buffer, int buffer_length); bool dirlist_generate_parent_link(const char *parent, char *buffer, int buffer_length); bool dirlist_generate_headings(char *buffer, int buffer_length); -bool dirlist_generate_row(bool even, bool directory, nsurl *url, char *name, - const char *mimetype, long long size, char *date, char *time, - char *buffer, int buffer_length); +bool dirlist_generate_row(bool even, bool directory, struct nsurl *url, + char *name, const char *mimetype, long long size, char *date, + char *time, char *buffer, int buffer_length); bool dirlist_generate_bottom(char *buffer, int buffer_length); #endif diff --git a/css/select.h b/css/select.h index 083fd91..13b9e12 100644 --- a/css/select.h +++ b/css/select.h @@ -24,9 +24,9 @@ #include <dom/dom.h> #include "css/css.h" -#include "utils/nsurl.h" struct content; +struct nsurl; /** * Selection context @@ -35,7 +35,7 @@ typedef struct nscss_select_ctx { css_select_ctx *ctx; bool quirks; - nsurl *base_url; + struct nsurl *base_url; lwc_string *universal; const css_computed_style *parent_style; } nscss_select_ctx; diff --git a/utils/corestrings.c b/utils/corestrings.c index 0f9c4d6..6e52a1b 100644 --- a/utils/corestrings.c +++ b/utils/corestrings.c @@ -23,6 +23,7 @@ #include <dom/dom.h> #include "utils/corestrings.h" +#include "utils/nsurl.h" #include "utils/utils.h" /* lwc_string strings */ diff --git a/utils/corestrings.h b/utils/corestrings.h index b558529..d51e11c 100644 --- a/utils/corestrings.h +++ b/utils/corestrings.h @@ -24,7 +24,6 @@ #define NETSURF_UTILS_CORESTRINGS_H_ #include <libwapcaplet/libwapcaplet.h> -#include "utils/nsurl.h" #include "utils/errors.h" /** File url prefix. */ @@ -289,6 +288,6 @@ extern struct dom_string *corestring_dom___ns_key_file_name_node_data; extern struct dom_string *corestring_dom___ns_key_image_coords_node_data; /* URLs */ -extern nsurl *corestring_nsurl_about_blank; +extern struct nsurl *corestring_nsurl_about_blank; #endif -- NetSurf Browser

8 years, 1 month

1
0
0 / 0

netsurf: branch master updated. release/3.2-723-g4402bcf

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/4402bcf779973bbefc264... ...commit http://git.netsurf-browser.org/netsurf.git/commit/4402bcf779973bbefc264e1... ...tree http://git.netsurf-browser.org/netsurf.git/tree/4402bcf779973bbefc264e125... The branch, master has been updated via 4402bcf779973bbefc264e125010ab51d08de9b4 (commit) from 50ac5b7ce7290532a00b2c6214badd16e4399a01 (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/commit/?id=4402bcf779973bbefc2... commit 4402bcf779973bbefc264e125010ab51d08de9b4 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Need nsurl. diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp index d1a9930..04b4261 100644 --- a/beos/scaffolding.cpp +++ b/beos/scaffolding.cpp @@ -64,6 +64,7 @@ extern "C" { #include "utils/messages.h" #include "utils/utils.h" #include "utils/log.h" +#include "utils/nsurl.h" #include "desktop/gui_clipboard.h" } #include "beos/about.h" diff --git a/beos/scaffolding.h b/beos/scaffolding.h index cdb481e..61d0691 100644 --- a/beos/scaffolding.h +++ b/beos/scaffolding.h @@ -28,6 +28,7 @@ extern "C" { #include "desktop/plotters.h" struct hlcache_handle; +struct nsurl; } ----------------------------------------------------------------------- Summary of changes: beos/scaffolding.cpp | 1 + beos/scaffolding.h | 1 + 2 files changed, 2 insertions(+) diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp index d1a9930..04b4261 100644 --- a/beos/scaffolding.cpp +++ b/beos/scaffolding.cpp @@ -64,6 +64,7 @@ extern "C" { #include "utils/messages.h" #include "utils/utils.h" #include "utils/log.h" +#include "utils/nsurl.h" #include "desktop/gui_clipboard.h" } #include "beos/about.h" diff --git a/beos/scaffolding.h b/beos/scaffolding.h index cdb481e..61d0691 100644 --- a/beos/scaffolding.h +++ b/beos/scaffolding.h @@ -28,6 +28,7 @@ extern "C" { #include "desktop/plotters.h" struct hlcache_handle; +struct nsurl; } -- NetSurf Browser

8 years, 1 month

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits February 2015