From cc1d5477ab32c544c915ffad880642f399e1a910 Mon Sep 17 00:00:00 2001 From: Steve Fryatt Date: Sun, 8 Jun 2014 18:29:03 +0100 Subject: Add disc cache parameters to configuration GUI. --- resources/FatMessages | 60 ++++++++++++++----- riscos/configure/con_cache.c | 32 ++++++++-- riscos/templates/de | 136 +++++++++++++++++++++++++++++++++++++++---- riscos/templates/en | 126 +++++++++++++++++++++++++++++++++++++-- riscos/templates/fr | 126 +++++++++++++++++++++++++++++++++++++-- riscos/templates/nl | 128 ++++++++++++++++++++++++++++++++++++++-- 6 files changed, 563 insertions(+), 45 deletions(-) diff --git a/resources/FatMessages b/resources/FatMessages index 74f03e456..ccc6d2097 100644 --- a/resources/FatMessages +++ b/resources/FatMessages @@ -4827,21 +4827,51 @@ de.ro.HelpCacheConfig5:Klicken mit AUSWAHL vergrößert die Größe des Cachespe fr.ro.HelpCacheConfig5:\Saugmenter la quantité de mémoire. it.ro.HelpCacheConfig5:\Saumenta la quantità di memoria. nl.ro.HelpCacheConfig5:\Sincrease the amount of memory. -en.ro.HelpCacheConfig7:\Sreset the Cache options back to their default values. -de.ro.HelpCacheConfig7:Stellt die Standardeinstellungen wieder her. -fr.ro.HelpCacheConfig7:\Srevenir aux valeurs par défaut des options du Cache. -it.ro.HelpCacheConfig7:\Sreset the Cache options back to their default values. -nl.ro.HelpCacheConfig7:\Sreset the Cache options back to their default values. -en.ro.HelpCacheConfig8:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. -de.ro.HelpCacheConfig8:Klicken mit AUSWAHL schließt das Fenster ohne die Änderungen zu speichern.|MKlicken mit SPEZIAL stellt die zuletzt abgespeicherten Einstellungen wieder her. -fr.ro.HelpCacheConfig8:\Sfermer cette fenêtre sans sauver les changements.|M\Arevenir aux options de Cache précédemment sauvegardées. -it.ro.HelpCacheConfig8:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. -nl.ro.HelpCacheConfig8:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. -en.ro.HelpCacheConfig9:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. -de.ro.HelpCacheConfig9:Klicken mit AUSWAHL speichert die Einstellungen und schließt das Fenster.|MKlicken mit SPEZIAL speichert die Einstellungen ohne das Fenster zu schließen. -fr.ro.HelpCacheConfig9:\Ssauver ces réglages et fermer la fenêtre.|M\Asauver ces réglages sans fermer la fenêtre. -it.ro.HelpCacheConfig9:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. -nl.ro.HelpCacheConfig9:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. +en.ro.HelpCacheConfig10:\Tamount of disc space to be used for caching content between sessions. +de.ro.HelpCacheConfig10:\Tamount of disc space to be used for caching content between sessions. +fr.ro.HelpCacheConfig10:\Tamount of disc space to be used for caching content between sessions. +it.ro.HelpCacheConfig10:\Tamount of disc space to be used for caching content between sessions. +nl.ro.HelpCacheConfig10:\Tamount of disc space to be used for caching content between sessions. +en.ro.HelpCacheConfig11:\Sreduce the amount of memory. +de.ro.HelpCacheConfig11:Klicken mit AUSWAHL verringert die Größe des Cachespeichers. +fr.ro.HelpCacheConfig11:\Sréduire la quantité de mémoire. +it.ro.HelpCacheConfig11:\Sriduce la quantità di memoria. +nl.ro.HelpCacheConfig11:\Sreduce the amount of memory. +en.ro.HelpCacheConfig12:\Sincrease the amount of memory. +de.ro.HelpCacheConfig12:Klicken mit AUSWAHL vergrößert die Größe des Cachespeichers. +fr.ro.HelpCacheConfig12:\Saugmenter la quantité de mémoire. +it.ro.HelpCacheConfig12:\Saumenta la quantità di memoria. +nl.ro.HelpCacheConfig12:\Sincrease the amount of memory. +en.ro.HelpCacheConfig15:\Tmaximum number of days that content will be retained in the disc cache. +de.ro.HelpCacheConfig15:\Tmaximum number of days that content will be retained in the disc cache. +fr.ro.HelpCacheConfig15:\Tmaximum number of days that content will be retained in the disc cache. +it.ro.HelpCacheConfig15:\Tmaximum number of days that content will be retained in the disc cache. +nl.ro.HelpCacheConfig15:\Tmaximum number of days that content will be retained in the disc cache. +en.ro.HelpCacheConfig16:\Sreduce the number of days. +de.ro.HelpCacheConfig16:\Sreduce the number of days. +fr.ro.HelpCacheConfig16:\Sreduce the number of days. +it.ro.HelpCacheConfig16:\Sreduce the number of days. +nl.ro.HelpCacheConfig16:\Sreduce the number of days. +en.ro.HelpCacheConfig17:\Sincrease the number of days. +de.ro.HelpCacheConfig17:\Sincrease the number of days. +fr.ro.HelpCacheConfig17:\Sincrease the number of days. +it.ro.HelpCacheConfig17:\Sincrease the number of days. +nl.ro.HelpCacheConfig17:\Sincrease the number of days. +en.ro.HelpCacheConfig19:\Sreset the Cache options back to their default values. +de.ro.HelpCacheConfig19:Stellt die Standardeinstellungen wieder her. +fr.ro.HelpCacheConfig19:\Srevenir aux valeurs par défaut des options du Cache. +it.ro.HelpCacheConfig19:\Sreset the Cache options back to their default values. +nl.ro.HelpCacheConfig19:\Sreset the Cache options back to their default values. +en.ro.HelpCacheConfig20:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. +de.ro.HelpCacheConfig20:Klicken mit AUSWAHL schließt das Fenster ohne die Änderungen zu speichern.|MKlicken mit SPEZIAL stellt die zuletzt abgespeicherten Einstellungen wieder her. +fr.ro.HelpCacheConfig20:\Sfermer cette fenêtre sans sauver les changements.|M\Arevenir aux options de Cache précédemment sauvegardées. +it.ro.HelpCacheConfig20:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. +nl.ro.HelpCacheConfig20:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. +en.ro.HelpCacheConfig21:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. +de.ro.HelpCacheConfig21:Klicken mit AUSWAHL speichert die Einstellungen und schließt das Fenster.|MKlicken mit SPEZIAL speichert die Einstellungen ohne das Fenster zu schließen. +fr.ro.HelpCacheConfig21:\Ssauver ces réglages et fermer la fenêtre.|M\Asauver ces réglages sans fermer la fenêtre. +it.ro.HelpCacheConfig21:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. +nl.ro.HelpCacheConfig21:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. en.ro.HelpConnectConfig:\Tconnection configuration \w de.ro.HelpConnectConfig:Das ist das Fenster zur Einstellung der Parameter für die Netzanbindung. diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c index cb464f799..468eef454 100644 --- a/riscos/configure/con_cache.c +++ b/riscos/configure/con_cache.c @@ -35,9 +35,15 @@ #define CACHE_MEMORY_SIZE 3 #define CACHE_MEMORY_DEC 4 #define CACHE_MEMORY_INC 5 -#define CACHE_DEFAULT_BUTTON 7 -#define CACHE_CANCEL_BUTTON 8 -#define CACHE_OK_BUTTON 9 +#define CACHE_DISC_SIZE 10 +#define CACHE_DISC_DEC 11 +#define CACHE_DISC_INC 12 +#define CACHE_DISC_EXPIRE 15 +#define CACHE_DISC_EXPIRE_DEC 16 +#define CACHE_DISC_EXPIRE_INC 17 +#define CACHE_DEFAULT_BUTTON 19 +#define CACHE_CANCEL_BUTTON 20 +#define CACHE_OK_BUTTON 21 static bool ro_gui_options_cache_click(wimp_pointer *pointer); static bool ro_gui_options_cache_ok(wimp_w w); @@ -47,10 +53,19 @@ bool ro_gui_options_cache_initialise(wimp_w w) /* set the current values */ ro_gui_set_icon_decimal(w, CACHE_MEMORY_SIZE, (nsoption_int(memory_cache_size) * 10) >> 20, 1); + ro_gui_set_icon_decimal(w, CACHE_DISC_SIZE, + (nsoption_int(disc_cache_size)) >> 20, 0); + ro_gui_set_icon_decimal(w, CACHE_DISC_EXPIRE, + (nsoption_int(disc_cache_age)), 0); /* initialise all functions for a newly created window */ ro_gui_wimp_event_register_numeric_field(w, CACHE_MEMORY_SIZE, CACHE_MEMORY_INC, CACHE_MEMORY_DEC, 0, 640, 1, 1); + ro_gui_wimp_event_register_numeric_field(w, CACHE_DISC_SIZE, + CACHE_DISC_INC, CACHE_DISC_DEC, 0, 2047, 1, 0); + ro_gui_wimp_event_register_numeric_field(w, CACHE_DISC_EXPIRE, + CACHE_DISC_EXPIRE_INC, CACHE_DISC_EXPIRE_DEC, 1, 3650, + 1, 0); ro_gui_wimp_event_register_mouse_click(w, ro_gui_options_cache_click); ro_gui_wimp_event_register_cancel(w, CACHE_CANCEL_BUTTON); ro_gui_wimp_event_register_ok(w, CACHE_OK_BUTTON, @@ -67,7 +82,11 @@ bool ro_gui_options_cache_click(wimp_pointer *pointer) case CACHE_DEFAULT_BUTTON: /* set the default values */ ro_gui_set_icon_decimal(pointer->w, CACHE_MEMORY_SIZE, - 20, 1); + 120, 1); + ro_gui_set_icon_decimal(pointer->w, CACHE_DISC_SIZE, + 1024, 0); + ro_gui_set_icon_decimal(pointer->w, CACHE_DISC_EXPIRE, + 28, 0); return true; } return false; @@ -78,6 +97,11 @@ bool ro_gui_options_cache_ok(wimp_w w) nsoption_set_int(memory_cache_size, (((ro_gui_get_icon_decimal(w, CACHE_MEMORY_SIZE, 1) + 1) << 20) - 1) / 10); + nsoption_set_int(disc_cache_size, + (((ro_gui_get_icon_decimal(w, + CACHE_DISC_SIZE, 0) + 1) << 20) - 1)); + nsoption_set_int(disc_cache_age, + ro_gui_get_icon_decimal(w, CACHE_DISC_EXPIRE, 0)); ro_gui_save_options(); return true; diff --git a/riscos/templates/de b/riscos/templates/de index 190d38a48..c840caa4b 100644 --- a/riscos/templates/de +++ b/riscos/templates/de @@ -28,7 +28,7 @@ wimp_window { wimp_window { template_name:"con_cache" - visible:500,860,1088,1100 + visible:500,672,1088,1100 xscroll:0 yscroll:0 next:wimp_TOP @@ -41,7 +41,7 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-240,588,0 + extent:0,-428,588,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED work_flags: sprite_area:&1 @@ -69,7 +69,7 @@ wimp_window { text_and_sprite.validation:"" } wimp_icon { - extent:80,-100,200,-56 + extent:44,-100,164,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -79,7 +79,7 @@ wimp_window { text.validation:"" } wimp_icon { - extent:204,-104,372,-52 + extent:168,-104,336,-52 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 @@ -89,7 +89,7 @@ wimp_window { text.validation:"Pptr_write;Kta" } wimp_icon { - extent:388,-96,420,-64 + extent:352,-96,384,-64 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 @@ -99,7 +99,7 @@ wimp_window { text_and_sprite.validation:"r5;sdown,pdown" } wimp_icon { - extent:420,-96,452,-64 + extent:384,-96,416,-64 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 @@ -109,7 +109,7 @@ wimp_window { text_and_sprite.validation:"r5;sup,pup" } wimp_icon { - extent:460,-100,516,-56 + extent:424,-100,480,-56 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -117,7 +117,123 @@ wimp_window { text_only:"MB" } wimp_icon { - extent:24,-208,188,-156 + extent:16,-312,568,-152 + icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"" + text.size:* + text.validation:"R4" + } + wimp_icon { + extent:32,-180,268,-136 + 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:" Disc cache " + text_and_sprite.size:* + text_and_sprite.validation:"" + } + wimp_icon { + extent:44,-232,164,-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:"Größe" + text.size:13 + text.validation:"" + } + wimp_icon { + extent:168,-236,336,-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 + icon_bg:wimp_COLOUR_WHITE + text.text:"512" + text.size:10 + text.validation:"Pptr_write;Kta;A0-9" + } + wimp_icon { + extent:352,-228,384,-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.validation:"r5;sdown,pdown" + } + wimp_icon { + extent:384,-228,416,-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.validation:"r5;sup,pup" + } + wimp_icon { + extent:424,-232,480,-192 + 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:"MB" + } + wimp_icon { + extent:44,-292,164,-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.validation:"" + } + wimp_icon { + extent:168,-296,336,-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 + icon_bg:wimp_COLOUR_WHITE + text.text:"512" + text.size:10 + text.validation:"Pptr_write;Kta;A0-9" + } + wimp_icon { + extent:352,-288,384,-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.validation:"r5;sdown,pdown" + } + wimp_icon { + extent:384,-288,416,-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.validation:"r5;sup,pup" + } + wimp_icon { + extent:424,-292,500,-252 + 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:"days" + } + wimp_icon { + extent:24,-396,188,-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 @@ -127,7 +243,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:204,-208,368,-156 + extent:204,-396,368,-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 @@ -137,7 +253,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:384,-216,568,-148 + extent:384,-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 diff --git a/riscos/templates/en b/riscos/templates/en index fed72b3ee..fbad63abf 100644 --- a/riscos/templates/en +++ b/riscos/templates/en @@ -28,7 +28,7 @@ wimp_window { wimp_window { template_name:"con_cache" - visible:184,870,772,1110 + visible:184,682,772,1110 xscroll:0 yscroll:0 next:wimp_TOP @@ -41,7 +41,7 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-240,588,0 + extent:0,-428,588,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED work_flags: sprite_area:&1 @@ -117,7 +117,123 @@ wimp_window { text_only:"MB" } wimp_icon { - extent:24,-208,188,-156 + extent:16,-312,568,-152 + icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"" + text.size:* + text.validation:"R4" + } + wimp_icon { + extent:32,-180,268,-136 + 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:" Disc cache " + text_and_sprite.size:* + text_and_sprite.validation:"" + } + wimp_icon { + extent:44,-232,164,-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:"Size" + text.size:13 + text.validation:"" + } + wimp_icon { + extent:168,-236,336,-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 + icon_bg:wimp_COLOUR_WHITE + text.text:"512" + text.size:10 + text.validation:"Pptr_write;Kta;A0-9" + } + wimp_icon { + extent:352,-228,384,-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.validation:"r5;sdown,pdown" + } + wimp_icon { + extent:384,-228,416,-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.validation:"r5;sup,pup" + } + wimp_icon { + extent:424,-232,480,-192 + 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:"MB" + } + wimp_icon { + extent:44,-292,164,-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.validation:"" + } + wimp_icon { + extent:168,-296,336,-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 + icon_bg:wimp_COLOUR_WHITE + text.text:"512" + text.size:10 + text.validation:"Pptr_write;Kta;A0-9" + } + wimp_icon { + extent:352,-288,384,-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.validation:"r5;sdown,pdown" + } + wimp_icon { + extent:384,-288,416,-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.validation:"r5;sup,pup" + } + wimp_icon { + extent:424,-292,500,-252 + 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:"days" + } + wimp_icon { + extent:24,-396,188,-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 @@ -127,7 +243,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:204,-208,368,-156 + extent:204,-396,368,-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 @@ -137,7 +253,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:384,-216,568,-148 + extent:384,-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 diff --git a/riscos/templates/fr b/riscos/templates/fr index 2acc5780e..11612dd5c 100644 --- a/riscos/templates/fr +++ b/riscos/templates/fr @@ -28,7 +28,7 @@ wimp_window { wimp_window { template_name:"con_cache" - visible:564,724,1152,964 + visible:564,536,1152,964 xscroll:0 yscroll:0 next:wimp_TOP @@ -41,7 +41,7 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-240,588,0 + extent:0,-428,588,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED work_flags: sprite_area:&1 @@ -117,7 +117,123 @@ wimp_window { text_only:"MB" } wimp_icon { - extent:24,-208,188,-156 + extent:16,-312,568,-152 + icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"" + text.size:* + text.validation:"R4" + } + wimp_icon { + extent:32,-180,268,-136 + 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:" Disc cache " + text_and_sprite.size:* + text_and_sprite.validation:"" + } + wimp_icon { + extent:44,-232,164,-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:"Taille" + text.size:13 + text.validation:"" + } + wimp_icon { + extent:168,-236,336,-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 + icon_bg:wimp_COLOUR_WHITE + text.text:"512" + text.size:10 + text.validation:"Pptr_write;Kta;A0-9" + } + wimp_icon { + extent:352,-228,384,-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.validation:"r5;sdown,pdown" + } + wimp_icon { + extent:384,-228,416,-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.validation:"r5;sup,pup" + } + wimp_icon { + extent:424,-232,480,-192 + 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:"MB" + } + wimp_icon { + extent:44,-292,164,-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.validation:"" + } + wimp_icon { + extent:168,-296,336,-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 + icon_bg:wimp_COLOUR_WHITE + text.text:"512" + text.size:10 + text.validation:"Pptr_write;Kta;A0-9" + } + wimp_icon { + extent:352,-288,384,-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.validation:"r5;sdown,pdown" + } + wimp_icon { + extent:384,-288,416,-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.validation:"r5;sup,pup" + } + wimp_icon { + extent:424,-292,500,-252 + 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:"days" + } + wimp_icon { + extent:24,-396,188,-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 @@ -127,7 +243,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:204,-208,368,-156 + extent:204,-396,368,-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 @@ -137,7 +253,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:384,-216,568,-148 + extent:384,-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 diff --git a/riscos/templates/nl b/riscos/templates/nl index 8e7725f9e..adef82198 100644 --- a/riscos/templates/nl +++ b/riscos/templates/nl @@ -28,7 +28,7 @@ wimp_window { wimp_window { template_name:"con_cache" - visible:184,870,772,1110 + visible:184,682,772,1110 xscroll:0 yscroll:0 next:wimp_TOP @@ -41,7 +41,7 @@ wimp_window { scroll_inner:wimp_COLOUR_VERY_LIGHT_GREY highlight_bg:wimp_COLOUR_CREAM extra_flags: - extent:0,-240,588,0 + extent:0,-428,588,0 title_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_FILLED work_flags: sprite_area:&1 @@ -69,7 +69,7 @@ wimp_window { text_and_sprite.validation:"" } wimp_icon { - extent:44,-104,164,-60 + extent:40,-104,164,-60 icon_flags:wimp_ICON_TEXT | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_ICON_RJUSTIFIED icon_esg:0 icon_fg:wimp_COLOUR_BLACK @@ -117,7 +117,123 @@ wimp_window { text_only:"MB" } wimp_icon { - extent:24,-208,188,-156 + extent:16,-312,568,-152 + icon_flags:wimp_ICON_TEXT | wimp_ICON_BORDER | wimp_ICON_HCENTRED | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED + icon_esg:0 + icon_fg:wimp_COLOUR_BLACK + icon_bg:wimp_COLOUR_VERY_LIGHT_GREY + text.text:"" + text.size:* + text.validation:"R4" + } + wimp_icon { + extent:32,-180,268,-136 + 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:" Disc cache " + text_and_sprite.size:* + text_and_sprite.validation:"" + } + wimp_icon { + extent:40,-232,164,-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.size:13 + text.validation:"" + } + wimp_icon { + extent:168,-236,336,-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 + icon_bg:wimp_COLOUR_WHITE + text.text:"512" + text.size:10 + text.validation:"Pptr_write;Kta;A0-9" + } + wimp_icon { + extent:352,-228,384,-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.validation:"r5;sdown,pdown" + } + wimp_icon { + extent:384,-228,416,-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.validation:"r5;sup,pup" + } + wimp_icon { + extent:424,-232,480,-192 + 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:"MB" + } + wimp_icon { + extent:44,-292,164,-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.validation:"" + } + wimp_icon { + extent:168,-296,336,-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 + icon_bg:wimp_COLOUR_WHITE + text.text:"512" + text.size:10 + text.validation:"Pptr_write;Kta;A0-9" + } + wimp_icon { + extent:352,-288,384,-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.validation:"r5;sdown,pdown" + } + wimp_icon { + extent:384,-288,416,-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.validation:"r5;sup,pup" + } + wimp_icon { + extent:424,-292,500,-252 + 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:"days" + } + wimp_icon { + extent:24,-396,188,-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 @@ -127,7 +243,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:204,-208,368,-156 + extent:204,-396,368,-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 @@ -137,7 +253,7 @@ wimp_window { text.validation:"R5,3" } wimp_icon { - extent:384,-216,568,-148 + extent:384,-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 -- cgit v1.2.3