RISC OS: Remove unused minimum gif delay from Choices.

The templates might need work to remove empty space.
This commit is contained in:
Michael Drake 2020-02-21 11:39:55 +00:00
parent db370bfdb7
commit 38c632a7da
5 changed files with 0 additions and 221 deletions

View File

@ -38,11 +38,6 @@
#define IMAGE_BACKGROUND_FIELD 6
#define IMAGE_BACKGROUND_MENU 7
#define IMAGE_CURRENT_DISPLAY 8
#define IMAGE_SPEED_TEXT 11
#define IMAGE_SPEED_FIELD 12
#define IMAGE_SPEED_DEC 13
#define IMAGE_SPEED_INC 14
#define IMAGE_SPEED_CS 15
#define IMAGE_DISABLE_ANIMATION 16
#define IMAGE_DEFAULT_BUTTON 17
#define IMAGE_CANCEL_BUTTON 18
@ -88,8 +83,6 @@ bool ro_gui_options_image_initialise(wimp_w w)
image_quality_menu->entries[i].
data.indirected_text.text, true);
}
ro_gui_set_icon_decimal(w, IMAGE_SPEED_FIELD,
nsoption_int(minimum_gif_delay), 2);
ro_gui_set_icon_selected_state(w, IMAGE_DISABLE_ANIMATION,
!nsoption_bool(animate_images));
ro_gui_options_update_shading(w);
@ -99,11 +92,7 @@ bool ro_gui_options_image_initialise(wimp_w w)
IMAGE_FOREGROUND_MENU, image_quality_menu);
ro_gui_wimp_event_register_menu_gright(w, IMAGE_BACKGROUND_FIELD,
IMAGE_BACKGROUND_MENU, image_quality_menu);
ro_gui_wimp_event_register_text_field(w, IMAGE_SPEED_TEXT);
ro_gui_wimp_event_register_numeric_field(w, IMAGE_SPEED_FIELD,
IMAGE_SPEED_INC, IMAGE_SPEED_DEC, 0, 6000, 10, 2);
ro_gui_wimp_event_register_checkbox(w, IMAGE_DISABLE_ANIMATION);
ro_gui_wimp_event_register_text_field(w, IMAGE_SPEED_CS);
ro_gui_wimp_event_register_redraw_window(w,
ro_gui_options_image_redraw);
ro_gui_wimp_event_register_mouse_click(w,
@ -218,8 +207,6 @@ bool ro_gui_options_image_click(wimp_pointer *pointer)
IMAGE_BACKGROUND_FIELD,
image_quality_menu->entries[2].
data.indirected_text.text, true);
ro_gui_set_icon_decimal(pointer->w, IMAGE_SPEED_FIELD,
10, 2);
ro_gui_set_icon_selected_state(pointer->w,
IMAGE_DISABLE_ANIMATION, false);
case IMAGE_DISABLE_ANIMATION:
@ -245,11 +232,6 @@ void ro_gui_options_update_shading(wimp_w w)
bool shaded;
shaded = ro_gui_get_icon_selected_state(w, IMAGE_DISABLE_ANIMATION);
ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_TEXT, shaded);
ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_FIELD, shaded);
ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_DEC, shaded);
ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_INC, shaded);
ro_gui_set_icon_shaded_state(w, IMAGE_SPEED_CS, shaded);
}
bool ro_gui_options_image_ok(wimp_w w)
@ -258,9 +240,6 @@ bool ro_gui_options_image_ok(wimp_w w)
(unsigned int *)&nsoption_int(plot_bg_quality),
(unsigned int *)&nsoption_int(plot_fg_quality));
nsoption_set_int(minimum_gif_delay,
ro_gui_get_icon_decimal(w, IMAGE_SPEED_FIELD, 2));
nsoption_set_bool(animate_images,
!ro_gui_get_icon_selected_state(w,
IMAGE_DISABLE_ANIMATION));

View File

@ -857,56 +857,6 @@ wimp_window {
text_and_sprite.size:16
text_and_sprite.validation:""
}
wimp_icon {
extent:20,-404,208,-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:"Speedlimit"
text.size:12
text.validation:""
}
wimp_icon {
extent:212,-408,380,-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"
}
wimp_icon {
extent:396,-400,428,-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.validation:"r5;sdown,pdown"
}
wimp_icon {
extent:428,-400,460,-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.validation:"r5;sup,pup"
}
wimp_icon {
extent:468,-404,612,-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:"Sekunden"
text.size:*
text.validation:""
}
wimp_icon {
extent:212,-460,640,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO

View File

@ -855,56 +855,6 @@ wimp_window {
text_and_sprite.size:16
text_and_sprite.validation:""
}
wimp_icon {
extent:20,-404,208,-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:"Speed limit"
text.size:*
text.validation:""
}
wimp_icon {
extent:212,-408,380,-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;A0-9."
}
wimp_icon {
extent:396,-400,428,-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.validation:"r5;sdown,pdown"
}
wimp_icon {
extent:428,-400,460,-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.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
icon_esg:0
icon_fg:wimp_COLOUR_BLACK
icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
text.text:"seconds"
text.size:*
text.validation:""
}
wimp_icon {
extent:212,-460,556,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO

View File

@ -859,56 +859,6 @@ wimp_window {
text_and_sprite.size:16
text_and_sprite.validation:""
}
wimp_icon {
extent:20,-404,208,-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:"Vitesse limite"
text.size:*
text.validation:""
}
wimp_icon {
extent:212,-408,380,-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"
}
wimp_icon {
extent:396,-400,428,-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.validation:"r5;sdown,pdown"
}
wimp_icon {
extent:428,-400,460,-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.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
icon_esg:0
icon_fg:wimp_COLOUR_BLACK
icon_bg:wimp_COLOUR_VERY_LIGHT_GREY
text.text:"secondes"
text.size:*
text.validation:""
}
wimp_icon {
extent:212,-460,628,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO

View File

@ -857,56 +857,6 @@ wimp_window {
text_and_sprite.size:16
text_and_sprite.validation:""
}
wimp_icon {
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:"Animatietijd"
text.size:15
text.validation:""
}
wimp_icon {
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:6
text.validation:"Pptr_write;Kta;A0-9."
}
wimp_icon {
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:1
text_and_sprite.validation:"r5;sdown,pdown"
}
wimp_icon {
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:1
text_and_sprite.validation:"r5;sup,pup"
}
wimp_icon {
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:"seconden"
text.size:9
text.validation:""
}
wimp_icon {
extent:236,-460,616,-416
icon_flags:wimp_ICON_TEXT | wimp_ICON_SPRITE | wimp_ICON_VCENTRED | wimp_ICON_INDIRECTED | wimp_BUTTON_RADIO