Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/9232b8fedae8b33e46af08c8ce3eed63363cff34
...commit
http://git.netsurf-browser.org/netsurf.git/commit/9232b8fedae8b33e46af08c8ce3eed63363cff34
...tree
http://git.netsurf-browser.org/netsurf.git/tree/9232b8fedae8b33e46af08c8ce3eed63363cff34
The branch, master has been updated
via 9232b8fedae8b33e46af08c8ce3eed63363cff34 (commit)
via 9a98f19611dad6af594cdda78bfeda56e0f9eafc (commit)
via cbaf33e02d45d05e1a23080f9bc0a8cd6c5f96fc (commit)
via 62a32a2a8ad7f683162de7f0f626b6791c4c62be (commit)
via bcf82925a3fc015feb728ede6be8b796d5436630 (commit)
via d1e8c84ea60e727d49ea51191cc4c2b6dcf886db (commit)
via 38c632a7da14c2b0e46b0b81724200578482f4c9 (commit)
from db370bfdb7a091bb85a4e2120e641fea0c663734 (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=9232b8fedae8b33e46af08c8ce3eed63363cff34
commit 9232b8fedae8b33e46af08c8ce3eed63363cff34
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Docs: Don't mention removed minimum GIF delay option.
diff --git a/docs/netsurf-fb.1 b/docs/netsurf-fb.1
index aa30ab3..045c1fe 100644
--- a/docs/netsurf-fb.1
+++ b/docs/netsurf-fb.1
@@ -95,9 +95,6 @@ Maximum disc cache size.
.B \-\-block_advertisements
Boolean to enable ad blocking.
.TP
-.B \-\-minimum_gif_delay
-Minimum time between gif frames
-.TP
.B \-\-send_referer
Boolean controlling whether referer data should be sent
.TP
diff --git a/docs/netsurf-gtk.1 b/docs/netsurf-gtk.1
index 10f0ae5..2ae61be 100644
--- a/docs/netsurf-gtk.1
+++ b/docs/netsurf-gtk.1
@@ -67,8 +67,6 @@ Maximum memory cache size.
Maximum disc cache size.
.It Fl -block_advertisements
Boolean to enable ad blocking.
-.It Fl -minimum_gif_delay
-Minimum time between gif frames
.It Fl -send_referer
Boolean controlling whether referrer data should be sent
.It Fl -animate_images
diff --git a/docs/netsurf-options.md b/docs/netsurf-options.md
index 5538138..4e87d9b 100644
--- a/docs/netsurf-options.md
+++ b/docs/netsurf-options.md
@@ -44,7 +44,6 @@ General Options
disc_cache_age | int | 28 | Preferred expiry age of disc
cache in days.
block_advertisements | bool | false | Whether to block advertisements
do_not_track | bool | false | Disable website tracking [1]
- minimum_gif_delay | int | 10 | Minimum GIF animation delay
send_referer | bool | true | Whether to send the referer HTTP
header.
foreground_images | bool | true | Whether to fetch foreground
images
background_images | bool | true | Whether to fetch background
images
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=9a98f19611dad6af594cdda78bfeda56e0f9eafc
commit 9a98f19611dad6af594cdda78bfeda56e0f9eafc
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Core: Remove unused minimum GIF delay option.
diff --git a/desktop/options.h b/desktop/options.h
index 0e56ad3..326e041 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -105,9 +105,6 @@ NSOPTION_BOOL(block_advertisements, false)
*
http://www.w3.org/Submission/2011/SUBM-web-tracking-protection-20110224/#dnt-uas
*/
NSOPTION_BOOL(do_not_track, false)
-/** Minimum GIF animation delay */
-NSOPTION_INTEGER(minimum_gif_delay, 10)
-
/** Whether to send the referer HTTP header */
NSOPTION_BOOL(send_referer, true)
diff --git a/test/data/Choices b/test/data/Choices
index a1fc15b..511ecf8 100644
--- a/test/data/Choices
+++ b/test/data/Choices
@@ -30,7 +30,6 @@ disc_cache_size:1073741824
disc_cache_age:28
block_advertisements:0
do_not_track:0
-minimum_gif_delay:10
send_referer:1
foreground_images:1
background_images:1
diff --git a/test/data/Choices-all b/test/data/Choices-all
index b430db5..65a467d 100644
--- a/test/data/Choices-all
+++ b/test/data/Choices-all
@@ -20,7 +20,6 @@ disc_cache_size:1073741824
disc_cache_age:28
block_advertisements:0
do_not_track:0
-minimum_gif_delay:10
send_referer:1
foreground_images:1
background_images:1
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=cbaf33e02d45d05e1a23080f9bc0a8cd6c5f96fc
commit cbaf33e02d45d05e1a23080f9bc0a8cd6c5f96fc
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Windows: Attempt to remove unused minimum GIF delay option.
diff --git a/frontends/windows/prefs.c b/frontends/windows/prefs.c
index 9937f2e..37f5584 100644
--- a/frontends/windows/prefs.c
+++ b/frontends/windows/prefs.c
@@ -230,13 +230,6 @@ static BOOL CALLBACK
options_appearance_dialog_handler(HWND hwnd,
sub = GetDlgItem(hwnd, IDC_PREFS_NOANIMATION);
SendMessage(sub, BM_SETCHECK,
(WPARAM)((nsoption_bool(animate_images))
? BST_UNCHECKED :
BST_CHECKED), 0);
-
- if (nsoption_int(minimum_gif_delay) != 0) {
- sub = GetDlgItem(hwnd, IDC_PREFS_ANIMATIONDELAY);
- snprintf(number, 6, "%.1f",
nsoption_int(minimum_gif_delay) /
- 100.0);
- SendMessage(sub, WM_SETTEXT, 0, (LPARAM)number);
- }
break;
case WM_NOTIFY:
@@ -268,18 +261,6 @@ static BOOL CALLBACK
options_appearance_dialog_handler(HWND hwnd,
nsoption_set_bool(animate_images,
(IsDlgButtonChecked(hwnd,
IDC_PREFS_NOANIMATION) == BST_CHECKED) ? true : false);
-
- sub = GetDlgItem(hwnd, IDC_PREFS_ANIMATIONDELAY);
- len = SendMessage(sub, WM_GETTEXTLENGTH, 0, 0);
- temp = malloc(len + 1);
- if (temp != NULL) {
- SendMessage(sub, WM_GETTEXT, (WPARAM)
- (len + 1), (LPARAM) temp);
- nsoption_set_int(minimum_gif_delay,
- (int)(100 * strtod(temp,
NULL)));
- free(temp);
- }
-
break;
case UDN_DELTAPOS: {
@@ -292,11 +273,6 @@ static BOOL CALLBACK
options_appearance_dialog_handler(HWND hwnd,
case IDC_PREFS_FONT_MINSIZE_SPIN:
change_spinner(GetDlgItem(hwnd,
IDC_PREFS_FONT_MINSIZE), 0.1 * ud->iDelta, 1.0, 50.0);
return TRUE;
-
- case IDC_PREFS_ANIMATIONDELAY_SPIN:
- change_spinner(GetDlgItem(hwnd,
IDC_PREFS_ANIMATIONDELAY), 0.1 * ud->iDelta, 0.1, 100.0);
- return TRUE;
-
}
}
break;
diff --git a/frontends/windows/res/resource.rc
b/frontends/windows/res/resource.rc
index 2d9e6cf..9e9927b 100644
--- a/frontends/windows/res/resource.rc
+++ b/frontends/windows/res/resource.rc
@@ -242,9 +242,6 @@ FONT 8, "MS Shell Dlg", 0, 0, 1
LTEXT "Animation", IDC_STATIC, 7, 148, 36, 8, NOT WS_GROUP |
SS_LEFT, WS_EX_LEFT
CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 43, 152, 170,
1, WS_EX_LEFT
AUTOCHECKBOX "Disable", IDC_PREFS_NOANIMATION, 43, 163, 39, 10, 0,
WS_EX_LEFT
- LTEXT "Minimum delay:", IDC_STATIC, 55, 180, 56, 8, SS_LEFT,
WS_EX_LEFT
- EDITTEXT IDC_PREFS_ANIMATIONDELAY, 113, 177, 35, 14, NOT WS_BORDER,
WS_EX_CLIENTEDGE
- CONTROL "Min delay", IDC_PREFS_ANIMATIONDELAY_SPIN, UPDOWN_CLASS,
UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 43, 210, 11, 15, WS_EX_LEFT
}
diff --git a/frontends/windows/resourceid.h b/frontends/windows/resourceid.h
index a0642b1..2933b15 100644
--- a/frontends/windows/resourceid.h
+++ b/frontends/windows/resourceid.h
@@ -88,8 +88,6 @@
#define IDC_PREFS_FANTASY 1219
#define IDC_PREFS_FONTDEF 1220
#define IDC_PREFS_NOANIMATION 1227
-#define IDC_PREFS_ANIMATIONDELAY 1228
-#define IDC_PREFS_ANIMATIONDELAY_SPIN 1229
#define IDD_SSLCERT 1600
#define IDC_SSLCERT_IMG1 1601
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=62a32a2a8ad7f683162de7f0f626b6791c4c62be
commit 62a32a2a8ad7f683162de7f0f626b6791c4c62be
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Atari: Attempt to remove unused minimum GIF delay option.
diff --git a/frontends/atari/res/netsurf.rsh b/frontends/atari/res/netsurf.rsh
index c856501..be2bc94 100755
--- a/frontends/atari/res/netsurf.rsh
+++ b/frontends/atari/res/netsurf.rsh
@@ -147,9 +147,6 @@
#define SETTINGS_EDIT_MIN_FONT_SIZE 28 /* FTEXT in tree SETTINGS */
#define SETTINGS_DEC_MIN_FONT_SIZE 29 /* BOXCHAR in tree SETTINGS */
#define SETTINGS_INC_MIN_FONT_SIZE 30 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_MIN_GIF_DELAY 35 /* FTEXT in tree SETTINGS */
-#define SETTINGS_INC_GIF_DELAY 36 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_DEC_GIF_DELAY 37 /* BOXCHAR in tree SETTINGS */
#define SETTINGS_CB_ENABLE_ANIMATION 40 /* BUTTON in tree SETTINGS */
#define SETTINGS_CB_BG_IMAGES 42 /* BUTTON in tree SETTINGS */
#define SETTINGS_CB_FG_IMAGES 44 /* BUTTON in tree SETTINGS */
diff --git a/frontends/atari/res/netsurf.rsm b/frontends/atari/res/netsurf.rsm
index 6c240d3..3122791 100755
--- a/frontends/atari/res/netsurf.rsm
+++ b/frontends/atari/res/netsurf.rsm
@@ -132,9 +132,6 @@ ResourceMaster v3.651
#O 28@29@EDIT_MIN_FONT_SIZE@@
#O 29@27@DEC_MIN_FONT_SIZE@@
#O 30@27@INC_MIN_FONT_SIZE@@
-#O 35@29@EDIT_MIN_GIF_DELAY@@
-#O 36@27@INC_GIF_DELAY@@
-#O 37@27@DEC_GIF_DELAY@@
#O 40@26@CB_ENABLE_ANIMATION@@
#O 42@26@CB_BG_IMAGES@@
#O 44@26@CB_FG_IMAGES@@
diff --git a/frontends/atari/settings.c b/frontends/atari/settings.c
index 7084bac..d76468c 100644
--- a/frontends/atari/settings.c
+++ b/frontends/atari/settings.c
@@ -48,7 +48,6 @@
extern char options[PATH_MAX];
extern GRECT desk_area;
-static float tmp_option_minimum_gif_delay;
static unsigned tmp_option_memory_cache_size;
static unsigned int tmp_option_disc_cache_size;
static unsigned int tmp_option_expire_url;
@@ -308,10 +307,6 @@ static void display_settings(void)
INPUT_MIN_REFLOW_PERIOD_MAX_LEN );
- tmp_option_minimum_gif_delay = (float)nsoption_int(minimum_gif_delay) /
(float)100;
- snprintf( spare, 255, "%01.1f", tmp_option_minimum_gif_delay );
- set_text( SETTINGS_EDIT_MIN_GIF_DELAY, spare, 3 );
-
/* "Network" tab: */
set_text( SETTINGS_EDIT_PROXY_HOST, nsoption_charp(http_proxy_host),
INPUT_PROXY_HOST_MAX_LEN );
@@ -464,11 +459,6 @@ static void form_event(int index, int external)
break;
case SETTINGS_CB_ENABLE_ANIMATION:
- if( checked ) {
- ENABLE_OBJ( SETTINGS_EDIT_MIN_GIF_DELAY );
- } else {
- DISABLE_OBJ( SETTINGS_EDIT_MIN_GIF_DELAY );
- }
break;
case SETTINGS_BT_SEL_FONT_RENDERER:
@@ -697,23 +687,6 @@ static void form_event(int index, int external)
OBJ_REDRAW(SETTINGS_EDIT_HISTORY_AGE);
break;
- case SETTINGS_INC_GIF_DELAY:
- case SETTINGS_DEC_GIF_DELAY:
- if( index == SETTINGS_INC_GIF_DELAY )
- tmp_option_minimum_gif_delay += 0.1;
- else
- tmp_option_minimum_gif_delay -= 0.1;
-
- if( tmp_option_minimum_gif_delay < 0.1 )
- tmp_option_minimum_gif_delay = 0.1;
- if( tmp_option_minimum_gif_delay > 9.0 )
- tmp_option_minimum_gif_delay = 9.0;
- snprintf( spare, 255, "%01.1f", tmp_option_minimum_gif_delay );
- set_text( SETTINGS_EDIT_MIN_GIF_DELAY, spare, 3 );
- is_button = true;
- OBJ_REDRAW(SETTINGS_EDIT_MIN_GIF_DELAY);
- break;
-
case SETTINGS_INC_MIN_FONT_SIZE:
case SETTINGS_DEC_MIN_FONT_SIZE:
if( index == SETTINGS_INC_MIN_FONT_SIZE )
@@ -817,8 +790,6 @@ static void apply_settings(void)
OBJ_SELECTED(SETTINGS_CB_TRANSPARENCY));
nsoption_set_bool(animate_images,
OBJ_SELECTED(SETTINGS_CB_ENABLE_ANIMATION));
- nsoption_set_int(minimum_gif_delay,
- (int)(tmp_option_minimum_gif_delay*100+0.5));
/* nsoption_set_bool(incremental_reflow,
OBJ_SELECTED(SETTINGS_CB_INCREMENTAL_REFLOW));*/
nsoption_set_int(min_reflow_period, tmp_option_min_reflow_period);
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=bcf82925a3fc015feb728ede6be8b796d5436630
commit bcf82925a3fc015feb728ede6be8b796d5436630
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
GTK: Remove unused minimum GIF delay option.
diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c
index 8ec41ca..a44e724 100644
--- a/frontends/gtk/preferences.c
+++ b/frontends/gtk/preferences.c
@@ -475,9 +475,6 @@ nsgtk_preferences_comboboxLoadImages_realize(GtkWidget
*widget,
/* enable animation */
TOGGLEBUTTON_SIGNALS(checkEnableAnimations, animate_images)
-/* frame time */
-SPINBUTTON_SIGNALS(spinAnimationSpeed, minimum_gif_delay, 100.0)
-
/* Fonts */
/* default font */
diff --git a/frontends/gtk/res/options.gtk2.ui
b/frontends/gtk/res/options.gtk2.ui
index ed596c0..907d0b5 100644
--- a/frontends/gtk/res/options.gtk2.ui
+++ b/frontends/gtk/res/options.gtk2.ui
@@ -1240,55 +1240,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">preferencesAnimationMinimum</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="spinAnimationSpeed">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="has_tooltip">True</property>
- <property name="tooltip_text"
translatable="yes">preferencesAnimationMinimumTooltip</property>
- <property
name="invisible_char">●</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <property
name="adjustment">adjustment_animation_time</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">True</property>
- <property
name="update_policy">if-valid</property>
- <signal name="value-changed"
handler="nsgtk_preferences_spinAnimationSpeed_valuechanged" swapped="no"/>
- <signal name="realize"
handler="nsgtk_preferences_spinAnimationSpeed_realize" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
</child>
</object>
diff --git a/frontends/gtk/res/options.gtk3.ui
b/frontends/gtk/res/options.gtk3.ui
index af0dd5c..4d3a426 100644
--- a/frontends/gtk/res/options.gtk3.ui
+++ b/frontends/gtk/res/options.gtk3.ui
@@ -1085,51 +1085,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">preferencesAnimationMinimum</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="spinAnimationSpeed">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="has_tooltip">True</property>
- <property name="tooltip_text"
translatable="yes">preferencesAnimationMinimumTooltip</property>
- <property
name="invisible_char">●</property>
- <property
name="adjustment">adjustment_animation_time</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">True</property>
- <property
name="update_policy">if-valid</property>
- <signal name="value-changed"
handler="nsgtk_preferences_spinAnimationSpeed_valuechanged" swapped="no"/>
- <signal name="realize"
handler="nsgtk_preferences_spinAnimationSpeed_realize" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
</child>
</object>
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=d1e8c84ea60e727d49ea51191cc4c2b6dcf886db
commit d1e8c84ea60e727d49ea51191cc4c2b6dcf886db
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Amiga: Try removing unused minimum GIF delay option.
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 36d8546..fa8cdee 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -116,7 +116,6 @@ enum
GID_OPTS_NATIVEBM,
GID_OPTS_SCALEQ,
GID_OPTS_DITHERQ,
- GID_OPTS_ANIMSPEED,
GID_OPTS_ANIMDISABLE,
GID_OPTS_DPI_Y,
GID_OPTS_FONT_SANS,
@@ -377,7 +376,6 @@ static void ami_gui_opts_setup(struct ami_gui_opts_window
*gow)
gadlab[GID_OPTS_NATIVEBM] = (char *)ami_utf8_easy((char
*)messages_get("CacheNative"));
gadlab[GID_OPTS_SCALEQ] = (char *)ami_utf8_easy((char
*)messages_get("ScaleQuality"));
gadlab[GID_OPTS_DITHERQ] = (char *)ami_utf8_easy((char
*)messages_get("DitherQuality"));
- gadlab[GID_OPTS_ANIMSPEED] = (char *)ami_utf8_easy((char
*)messages_get("AnimSpeedLimit"));
gadlab[GID_OPTS_DPI_Y] = (char *)ami_utf8_easy((char
*)messages_get("ResolutionY"));
gadlab[GID_OPTS_ANIMDISABLE] = (char *)ami_utf8_easy((char
*)messages_get("AnimDisable"));
gadlab[GID_OPTS_FONT_SANS] = (char *)ami_utf8_easy((char
*)messages_get("FontSans"));
@@ -423,7 +421,6 @@ static void ami_gui_opts_setup(struct ami_gui_opts_window
*gow)
gadlab[LAB_OPTS_WINTITLE] = (char *)ami_utf8_easy((char
*)messages_get("Preferences"));
gadlab[LAB_OPTS_RESTART] = (char *)ami_utf8_easy((char
*)messages_get("NeedRestart"));
gadlab[LAB_OPTS_DAYS] = (char *)ami_utf8_easy((char
*)messages_get("Days"));
- gadlab[LAB_OPTS_SECS] = (char *)ami_utf8_easy((char
*)messages_get("AnimSpeedFrames"));
gadlab[LAB_OPTS_PT] = (char *)ami_utf8_easy((char *)messages_get("Pt"));
gadlab[LAB_OPTS_MM] = (char *)ami_utf8_easy((char *)messages_get("MM"));
gadlab[LAB_OPTS_MB] = (char *)ami_utf8_easy((char
*)messages_get("MBytes"));
@@ -514,12 +511,11 @@ void ami_gui_opts_open(void)
ULONG proxytype = 0;
BOOL screenmodedisabled = FALSE, screennamedisabled = FALSE;
BOOL proxyhostdisabled = TRUE, proxyauthdisabled = TRUE,
proxybypassdisabled = FALSE;
- BOOL disableanims, animspeeddisabled = FALSE, acceptlangdisabled =
FALSE;
+ BOOL disableanims, acceptlangdisabled = FALSE;
BOOL scaleselected = nsoption_bool(scale_quality), scaledisabled =
FALSE;
BOOL ditherdisable = TRUE;
BOOL download_notify_disabled = FALSE, tab_always_show_disabled = FALSE;
BOOL ptr_disable = FALSE;
- char animspeed[10];
char *homepage_url_lc = ami_utf8_easy(nsoption_charp(homepage_url));
struct TextAttr fontsans, fontserif, fontmono, fontcursive, fontfantasy;
@@ -583,17 +579,13 @@ void ami_gui_opts_open(void)
proxybypassdisabled = TRUE;
}
-
sprintf(animspeed,"%.2f",(float)(nsoption_int(minimum_gif_delay)/100.0));
-
if(nsoption_bool(animate_images))
{
disableanims = FALSE;
- animspeeddisabled = FALSE;
}
else
{
disableanims = TRUE;
- animspeeddisabled = TRUE;
}
if(nsoption_bool(accept_lang_locale))
@@ -1071,24 +1063,6 @@ void ami_gui_opts_open(void)
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_ANIMS],
-
LAYOUT_AddChild, LayoutHObj,
-
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
-
LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMSPEED] = StringObj,
-
GA_ID, GID_OPTS_ANIMSPEED,
-
GA_RelVerify, TRUE,
-
GA_Disabled, animspeeddisabled,
-
STRINGA_HookType, SHK_FLOAT,
-
STRINGA_TextVal, animspeed,
-
STRINGA_BufferPos,0,
-
StringEnd,
-
CHILD_WeightedWidth, 0,
-
CHILD_Label, LabelObj,
-
LABEL_Text, gadlab[LAB_OPTS_SECS],
-
LabelEnd,
-
LayoutEnd,
-
CHILD_Label, LabelObj,
-
LABEL_Text, gadlab[GID_OPTS_ANIMSPEED],
-
LabelEnd,
LAYOUT_AddChild,
gow->objects[GID_OPTS_ANIMDISABLE] = CheckBoxObj,
GA_ID,
GID_OPTS_ANIMDISABLE,
GA_RelVerify,
TRUE,
@@ -1684,7 +1658,6 @@ void ami_gui_opts_open(void)
static void ami_gui_opts_use(bool save)
{
ULONG data, id = 0;
- float animspeed;
struct TextAttr *tattr;
char *dot;
bool rescan_fonts = false;
@@ -1835,10 +1808,6 @@ static void ami_gui_opts_use(bool save)
GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_DITHERQ],(ULONG
*)&nsoption_int(dither_quality));
- GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_ANIMSPEED],(ULONG
*)&data);
- animspeed = strtof((char *)data, NULL);
- nsoption_set_int(minimum_gif_delay, (int)(animspeed * 100));
-
GetAttr(GA_Selected,gow->objects[GID_OPTS_ANIMDISABLE],(ULONG *)&data);
if(data) {
nsoption_set_bool(animate_images, false);
@@ -2250,8 +2219,6 @@ static BOOL ami_gui_opts_event(void *w)
break;
case GID_OPTS_ANIMDISABLE:
- RefreshSetGadgetAttrs((struct
Gadget *)gow->objects[GID_OPTS_ANIMSPEED],
- gow->win,NULL,
GA_Disabled, code, TAG_DONE);
break;
case GID_OPTS_FONT_SANS:
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=38c632a7da14c2b0e46b0b81724200578482f4c9
commit 38c632a7da14c2b0e46b0b81724200578482f4c9
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
RISC OS: Remove unused minimum gif delay from Choices.
The templates might need work to remove empty space.
diff --git a/frontends/riscos/configure/con_image.c
b/frontends/riscos/configure/con_image.c
index c7fc7f3..3f12f89 100644
--- a/frontends/riscos/configure/con_image.c
+++ b/frontends/riscos/configure/con_image.c
@@ -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));
diff --git a/frontends/riscos/templates/de b/frontends/riscos/templates/de
index ee35750..ef67b2c 100644
--- a/frontends/riscos/templates/de
+++ b/frontends/riscos/templates/de
@@ -858,56 +858,6 @@ wimp_window {
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
icon_esg:0
diff --git a/frontends/riscos/templates/en b/frontends/riscos/templates/en
index fa7c2ce..8db0f94 100644
--- a/frontends/riscos/templates/en
+++ b/frontends/riscos/templates/en
@@ -856,56 +856,6 @@ wimp_window {
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
icon_esg:0
diff --git a/frontends/riscos/templates/fr b/frontends/riscos/templates/fr
index 48b4ab0..9ca0d7c 100644
--- a/frontends/riscos/templates/fr
+++ b/frontends/riscos/templates/fr
@@ -860,56 +860,6 @@ wimp_window {
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
icon_esg:0
diff --git a/frontends/riscos/templates/nl b/frontends/riscos/templates/nl
index 19b6e70..a3426a1 100644
--- a/frontends/riscos/templates/nl
+++ b/frontends/riscos/templates/nl
@@ -858,56 +858,6 @@ wimp_window {
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
icon_esg:0
-----------------------------------------------------------------------
Summary of changes:
desktop/options.h | 3 --
docs/netsurf-fb.1 | 3 --
docs/netsurf-gtk.1 | 2 --
docs/netsurf-options.md | 1 -
frontends/amiga/gui_options.c | 35 +---------------------
frontends/atari/res/netsurf.rsh | 3 --
frontends/atari/res/netsurf.rsm | 3 --
frontends/atari/settings.c | 29 ------------------
frontends/gtk/preferences.c | 3 --
frontends/gtk/res/options.gtk2.ui | 49 -------------------------------
frontends/gtk/res/options.gtk3.ui | 45 ----------------------------
frontends/riscos/configure/con_image.c | 21 --------------
frontends/riscos/templates/de | 50 --------------------------------
frontends/riscos/templates/en | 50 --------------------------------
frontends/riscos/templates/fr | 50 --------------------------------
frontends/riscos/templates/nl | 50 --------------------------------
frontends/windows/prefs.c | 24 ---------------
frontends/windows/res/resource.rc | 3 --
frontends/windows/resourceid.h | 2 --
test/data/Choices | 1 -
test/data/Choices-all | 1 -
21 files changed, 1 insertion(+), 427 deletions(-)
diff --git a/desktop/options.h b/desktop/options.h
index 0e56ad3..326e041 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -105,9 +105,6 @@ NSOPTION_BOOL(block_advertisements, false)
*
http://www.w3.org/Submission/2011/SUBM-web-tracking-protection-20110224/#dnt-uas
*/
NSOPTION_BOOL(do_not_track, false)
-/** Minimum GIF animation delay */
-NSOPTION_INTEGER(minimum_gif_delay, 10)
-
/** Whether to send the referer HTTP header */
NSOPTION_BOOL(send_referer, true)
diff --git a/docs/netsurf-fb.1 b/docs/netsurf-fb.1
index aa30ab3..045c1fe 100644
--- a/docs/netsurf-fb.1
+++ b/docs/netsurf-fb.1
@@ -95,9 +95,6 @@ Maximum disc cache size.
.B \-\-block_advertisements
Boolean to enable ad blocking.
.TP
-.B \-\-minimum_gif_delay
-Minimum time between gif frames
-.TP
.B \-\-send_referer
Boolean controlling whether referer data should be sent
.TP
diff --git a/docs/netsurf-gtk.1 b/docs/netsurf-gtk.1
index 10f0ae5..2ae61be 100644
--- a/docs/netsurf-gtk.1
+++ b/docs/netsurf-gtk.1
@@ -67,8 +67,6 @@ Maximum memory cache size.
Maximum disc cache size.
.It Fl -block_advertisements
Boolean to enable ad blocking.
-.It Fl -minimum_gif_delay
-Minimum time between gif frames
.It Fl -send_referer
Boolean controlling whether referrer data should be sent
.It Fl -animate_images
diff --git a/docs/netsurf-options.md b/docs/netsurf-options.md
index 5538138..4e87d9b 100644
--- a/docs/netsurf-options.md
+++ b/docs/netsurf-options.md
@@ -44,7 +44,6 @@ General Options
disc_cache_age | int | 28 | Preferred expiry age of disc
cache in days.
block_advertisements | bool | false | Whether to block advertisements
do_not_track | bool | false | Disable website tracking [1]
- minimum_gif_delay | int | 10 | Minimum GIF animation delay
send_referer | bool | true | Whether to send the referer HTTP
header.
foreground_images | bool | true | Whether to fetch foreground
images
background_images | bool | true | Whether to fetch background
images
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 36d8546..fa8cdee 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -116,7 +116,6 @@ enum
GID_OPTS_NATIVEBM,
GID_OPTS_SCALEQ,
GID_OPTS_DITHERQ,
- GID_OPTS_ANIMSPEED,
GID_OPTS_ANIMDISABLE,
GID_OPTS_DPI_Y,
GID_OPTS_FONT_SANS,
@@ -377,7 +376,6 @@ static void ami_gui_opts_setup(struct ami_gui_opts_window
*gow)
gadlab[GID_OPTS_NATIVEBM] = (char *)ami_utf8_easy((char
*)messages_get("CacheNative"));
gadlab[GID_OPTS_SCALEQ] = (char *)ami_utf8_easy((char
*)messages_get("ScaleQuality"));
gadlab[GID_OPTS_DITHERQ] = (char *)ami_utf8_easy((char
*)messages_get("DitherQuality"));
- gadlab[GID_OPTS_ANIMSPEED] = (char *)ami_utf8_easy((char
*)messages_get("AnimSpeedLimit"));
gadlab[GID_OPTS_DPI_Y] = (char *)ami_utf8_easy((char
*)messages_get("ResolutionY"));
gadlab[GID_OPTS_ANIMDISABLE] = (char *)ami_utf8_easy((char
*)messages_get("AnimDisable"));
gadlab[GID_OPTS_FONT_SANS] = (char *)ami_utf8_easy((char
*)messages_get("FontSans"));
@@ -423,7 +421,6 @@ static void ami_gui_opts_setup(struct ami_gui_opts_window
*gow)
gadlab[LAB_OPTS_WINTITLE] = (char *)ami_utf8_easy((char
*)messages_get("Preferences"));
gadlab[LAB_OPTS_RESTART] = (char *)ami_utf8_easy((char
*)messages_get("NeedRestart"));
gadlab[LAB_OPTS_DAYS] = (char *)ami_utf8_easy((char
*)messages_get("Days"));
- gadlab[LAB_OPTS_SECS] = (char *)ami_utf8_easy((char
*)messages_get("AnimSpeedFrames"));
gadlab[LAB_OPTS_PT] = (char *)ami_utf8_easy((char *)messages_get("Pt"));
gadlab[LAB_OPTS_MM] = (char *)ami_utf8_easy((char *)messages_get("MM"));
gadlab[LAB_OPTS_MB] = (char *)ami_utf8_easy((char
*)messages_get("MBytes"));
@@ -514,12 +511,11 @@ void ami_gui_opts_open(void)
ULONG proxytype = 0;
BOOL screenmodedisabled = FALSE, screennamedisabled = FALSE;
BOOL proxyhostdisabled = TRUE, proxyauthdisabled = TRUE,
proxybypassdisabled = FALSE;
- BOOL disableanims, animspeeddisabled = FALSE, acceptlangdisabled =
FALSE;
+ BOOL disableanims, acceptlangdisabled = FALSE;
BOOL scaleselected = nsoption_bool(scale_quality), scaledisabled =
FALSE;
BOOL ditherdisable = TRUE;
BOOL download_notify_disabled = FALSE, tab_always_show_disabled = FALSE;
BOOL ptr_disable = FALSE;
- char animspeed[10];
char *homepage_url_lc = ami_utf8_easy(nsoption_charp(homepage_url));
struct TextAttr fontsans, fontserif, fontmono, fontcursive, fontfantasy;
@@ -583,17 +579,13 @@ void ami_gui_opts_open(void)
proxybypassdisabled = TRUE;
}
-
sprintf(animspeed,"%.2f",(float)(nsoption_int(minimum_gif_delay)/100.0));
-
if(nsoption_bool(animate_images))
{
disableanims = FALSE;
- animspeeddisabled = FALSE;
}
else
{
disableanims = TRUE;
- animspeeddisabled = TRUE;
}
if(nsoption_bool(accept_lang_locale))
@@ -1071,24 +1063,6 @@ void ami_gui_opts_open(void)
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_ANIMS],
-
LAYOUT_AddChild, LayoutHObj,
-
LAYOUT_LabelColumn, PLACETEXT_RIGHT,
-
LAYOUT_AddChild, gow->objects[GID_OPTS_ANIMSPEED] = StringObj,
-
GA_ID, GID_OPTS_ANIMSPEED,
-
GA_RelVerify, TRUE,
-
GA_Disabled, animspeeddisabled,
-
STRINGA_HookType, SHK_FLOAT,
-
STRINGA_TextVal, animspeed,
-
STRINGA_BufferPos,0,
-
StringEnd,
-
CHILD_WeightedWidth, 0,
-
CHILD_Label, LabelObj,
-
LABEL_Text, gadlab[LAB_OPTS_SECS],
-
LabelEnd,
-
LayoutEnd,
-
CHILD_Label, LabelObj,
-
LABEL_Text, gadlab[GID_OPTS_ANIMSPEED],
-
LabelEnd,
LAYOUT_AddChild,
gow->objects[GID_OPTS_ANIMDISABLE] = CheckBoxObj,
GA_ID,
GID_OPTS_ANIMDISABLE,
GA_RelVerify,
TRUE,
@@ -1684,7 +1658,6 @@ void ami_gui_opts_open(void)
static void ami_gui_opts_use(bool save)
{
ULONG data, id = 0;
- float animspeed;
struct TextAttr *tattr;
char *dot;
bool rescan_fonts = false;
@@ -1835,10 +1808,6 @@ static void ami_gui_opts_use(bool save)
GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_DITHERQ],(ULONG
*)&nsoption_int(dither_quality));
- GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_ANIMSPEED],(ULONG
*)&data);
- animspeed = strtof((char *)data, NULL);
- nsoption_set_int(minimum_gif_delay, (int)(animspeed * 100));
-
GetAttr(GA_Selected,gow->objects[GID_OPTS_ANIMDISABLE],(ULONG *)&data);
if(data) {
nsoption_set_bool(animate_images, false);
@@ -2250,8 +2219,6 @@ static BOOL ami_gui_opts_event(void *w)
break;
case GID_OPTS_ANIMDISABLE:
- RefreshSetGadgetAttrs((struct
Gadget *)gow->objects[GID_OPTS_ANIMSPEED],
- gow->win,NULL,
GA_Disabled, code, TAG_DONE);
break;
case GID_OPTS_FONT_SANS:
diff --git a/frontends/atari/res/netsurf.rsh b/frontends/atari/res/netsurf.rsh
index c856501..be2bc94 100755
--- a/frontends/atari/res/netsurf.rsh
+++ b/frontends/atari/res/netsurf.rsh
@@ -147,9 +147,6 @@
#define SETTINGS_EDIT_MIN_FONT_SIZE 28 /* FTEXT in tree SETTINGS */
#define SETTINGS_DEC_MIN_FONT_SIZE 29 /* BOXCHAR in tree SETTINGS */
#define SETTINGS_INC_MIN_FONT_SIZE 30 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_MIN_GIF_DELAY 35 /* FTEXT in tree SETTINGS */
-#define SETTINGS_INC_GIF_DELAY 36 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_DEC_GIF_DELAY 37 /* BOXCHAR in tree SETTINGS */
#define SETTINGS_CB_ENABLE_ANIMATION 40 /* BUTTON in tree SETTINGS */
#define SETTINGS_CB_BG_IMAGES 42 /* BUTTON in tree SETTINGS */
#define SETTINGS_CB_FG_IMAGES 44 /* BUTTON in tree SETTINGS */
diff --git a/frontends/atari/res/netsurf.rsm b/frontends/atari/res/netsurf.rsm
index 6c240d3..3122791 100755
--- a/frontends/atari/res/netsurf.rsm
+++ b/frontends/atari/res/netsurf.rsm
@@ -132,9 +132,6 @@ ResourceMaster v3.651
#O 28@29@EDIT_MIN_FONT_SIZE@@
#O 29@27@DEC_MIN_FONT_SIZE@@
#O 30@27@INC_MIN_FONT_SIZE@@
-#O 35@29@EDIT_MIN_GIF_DELAY@@
-#O 36@27@INC_GIF_DELAY@@
-#O 37@27@DEC_GIF_DELAY@@
#O 40@26@CB_ENABLE_ANIMATION@@
#O 42@26@CB_BG_IMAGES@@
#O 44@26@CB_FG_IMAGES@@
diff --git a/frontends/atari/settings.c b/frontends/atari/settings.c
index 7084bac..d76468c 100644
--- a/frontends/atari/settings.c
+++ b/frontends/atari/settings.c
@@ -48,7 +48,6 @@
extern char options[PATH_MAX];
extern GRECT desk_area;
-static float tmp_option_minimum_gif_delay;
static unsigned tmp_option_memory_cache_size;
static unsigned int tmp_option_disc_cache_size;
static unsigned int tmp_option_expire_url;
@@ -308,10 +307,6 @@ static void display_settings(void)
INPUT_MIN_REFLOW_PERIOD_MAX_LEN );
- tmp_option_minimum_gif_delay = (float)nsoption_int(minimum_gif_delay) /
(float)100;
- snprintf( spare, 255, "%01.1f", tmp_option_minimum_gif_delay );
- set_text( SETTINGS_EDIT_MIN_GIF_DELAY, spare, 3 );
-
/* "Network" tab: */
set_text( SETTINGS_EDIT_PROXY_HOST, nsoption_charp(http_proxy_host),
INPUT_PROXY_HOST_MAX_LEN );
@@ -464,11 +459,6 @@ static void form_event(int index, int external)
break;
case SETTINGS_CB_ENABLE_ANIMATION:
- if( checked ) {
- ENABLE_OBJ( SETTINGS_EDIT_MIN_GIF_DELAY );
- } else {
- DISABLE_OBJ( SETTINGS_EDIT_MIN_GIF_DELAY );
- }
break;
case SETTINGS_BT_SEL_FONT_RENDERER:
@@ -697,23 +687,6 @@ static void form_event(int index, int external)
OBJ_REDRAW(SETTINGS_EDIT_HISTORY_AGE);
break;
- case SETTINGS_INC_GIF_DELAY:
- case SETTINGS_DEC_GIF_DELAY:
- if( index == SETTINGS_INC_GIF_DELAY )
- tmp_option_minimum_gif_delay += 0.1;
- else
- tmp_option_minimum_gif_delay -= 0.1;
-
- if( tmp_option_minimum_gif_delay < 0.1 )
- tmp_option_minimum_gif_delay = 0.1;
- if( tmp_option_minimum_gif_delay > 9.0 )
- tmp_option_minimum_gif_delay = 9.0;
- snprintf( spare, 255, "%01.1f", tmp_option_minimum_gif_delay );
- set_text( SETTINGS_EDIT_MIN_GIF_DELAY, spare, 3 );
- is_button = true;
- OBJ_REDRAW(SETTINGS_EDIT_MIN_GIF_DELAY);
- break;
-
case SETTINGS_INC_MIN_FONT_SIZE:
case SETTINGS_DEC_MIN_FONT_SIZE:
if( index == SETTINGS_INC_MIN_FONT_SIZE )
@@ -817,8 +790,6 @@ static void apply_settings(void)
OBJ_SELECTED(SETTINGS_CB_TRANSPARENCY));
nsoption_set_bool(animate_images,
OBJ_SELECTED(SETTINGS_CB_ENABLE_ANIMATION));
- nsoption_set_int(minimum_gif_delay,
- (int)(tmp_option_minimum_gif_delay*100+0.5));
/* nsoption_set_bool(incremental_reflow,
OBJ_SELECTED(SETTINGS_CB_INCREMENTAL_REFLOW));*/
nsoption_set_int(min_reflow_period, tmp_option_min_reflow_period);
diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c
index 8ec41ca..a44e724 100644
--- a/frontends/gtk/preferences.c
+++ b/frontends/gtk/preferences.c
@@ -475,9 +475,6 @@ nsgtk_preferences_comboboxLoadImages_realize(GtkWidget
*widget,
/* enable animation */
TOGGLEBUTTON_SIGNALS(checkEnableAnimations, animate_images)
-/* frame time */
-SPINBUTTON_SIGNALS(spinAnimationSpeed, minimum_gif_delay, 100.0)
-
/* Fonts */
/* default font */
diff --git a/frontends/gtk/res/options.gtk2.ui
b/frontends/gtk/res/options.gtk2.ui
index ed596c0..907d0b5 100644
--- a/frontends/gtk/res/options.gtk2.ui
+++ b/frontends/gtk/res/options.gtk2.ui
@@ -1240,55 +1240,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">preferencesAnimationMinimum</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="spinAnimationSpeed">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="has_tooltip">True</property>
- <property name="tooltip_text"
translatable="yes">preferencesAnimationMinimumTooltip</property>
- <property
name="invisible_char">●</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <property
name="adjustment">adjustment_animation_time</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">True</property>
- <property
name="update_policy">if-valid</property>
- <signal name="value-changed"
handler="nsgtk_preferences_spinAnimationSpeed_valuechanged" swapped="no"/>
- <signal name="realize"
handler="nsgtk_preferences_spinAnimationSpeed_realize" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
</child>
</object>
diff --git a/frontends/gtk/res/options.gtk3.ui
b/frontends/gtk/res/options.gtk3.ui
index af0dd5c..4d3a426 100644
--- a/frontends/gtk/res/options.gtk3.ui
+++ b/frontends/gtk/res/options.gtk3.ui
@@ -1085,51 +1085,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkHBox" id="hbox9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">preferencesAnimationMinimum</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="spinAnimationSpeed">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="has_tooltip">True</property>
- <property name="tooltip_text"
translatable="yes">preferencesAnimationMinimumTooltip</property>
- <property
name="invisible_char">●</property>
- <property
name="adjustment">adjustment_animation_time</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">True</property>
- <property
name="update_policy">if-valid</property>
- <signal name="value-changed"
handler="nsgtk_preferences_spinAnimationSpeed_valuechanged" swapped="no"/>
- <signal name="realize"
handler="nsgtk_preferences_spinAnimationSpeed_realize" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
</child>
</object>
diff --git a/frontends/riscos/configure/con_image.c
b/frontends/riscos/configure/con_image.c
index c7fc7f3..3f12f89 100644
--- a/frontends/riscos/configure/con_image.c
+++ b/frontends/riscos/configure/con_image.c
@@ -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));
diff --git a/frontends/riscos/templates/de b/frontends/riscos/templates/de
index ee35750..ef67b2c 100644
--- a/frontends/riscos/templates/de
+++ b/frontends/riscos/templates/de
@@ -858,56 +858,6 @@ wimp_window {
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
icon_esg:0
diff --git a/frontends/riscos/templates/en b/frontends/riscos/templates/en
index fa7c2ce..8db0f94 100644
--- a/frontends/riscos/templates/en
+++ b/frontends/riscos/templates/en
@@ -856,56 +856,6 @@ wimp_window {
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
icon_esg:0
diff --git a/frontends/riscos/templates/fr b/frontends/riscos/templates/fr
index 48b4ab0..9ca0d7c 100644
--- a/frontends/riscos/templates/fr
+++ b/frontends/riscos/templates/fr
@@ -860,56 +860,6 @@ wimp_window {
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
icon_esg:0
diff --git a/frontends/riscos/templates/nl b/frontends/riscos/templates/nl
index 19b6e70..a3426a1 100644
--- a/frontends/riscos/templates/nl
+++ b/frontends/riscos/templates/nl
@@ -858,56 +858,6 @@ wimp_window {
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
icon_esg:0
diff --git a/frontends/windows/prefs.c b/frontends/windows/prefs.c
index 9937f2e..37f5584 100644
--- a/frontends/windows/prefs.c
+++ b/frontends/windows/prefs.c
@@ -230,13 +230,6 @@ static BOOL CALLBACK
options_appearance_dialog_handler(HWND hwnd,
sub = GetDlgItem(hwnd, IDC_PREFS_NOANIMATION);
SendMessage(sub, BM_SETCHECK,
(WPARAM)((nsoption_bool(animate_images))
? BST_UNCHECKED :
BST_CHECKED), 0);
-
- if (nsoption_int(minimum_gif_delay) != 0) {
- sub = GetDlgItem(hwnd, IDC_PREFS_ANIMATIONDELAY);
- snprintf(number, 6, "%.1f",
nsoption_int(minimum_gif_delay) /
- 100.0);
- SendMessage(sub, WM_SETTEXT, 0, (LPARAM)number);
- }
break;
case WM_NOTIFY:
@@ -268,18 +261,6 @@ static BOOL CALLBACK
options_appearance_dialog_handler(HWND hwnd,
nsoption_set_bool(animate_images,
(IsDlgButtonChecked(hwnd,
IDC_PREFS_NOANIMATION) == BST_CHECKED) ? true : false);
-
- sub = GetDlgItem(hwnd, IDC_PREFS_ANIMATIONDELAY);
- len = SendMessage(sub, WM_GETTEXTLENGTH, 0, 0);
- temp = malloc(len + 1);
- if (temp != NULL) {
- SendMessage(sub, WM_GETTEXT, (WPARAM)
- (len + 1), (LPARAM) temp);
- nsoption_set_int(minimum_gif_delay,
- (int)(100 * strtod(temp,
NULL)));
- free(temp);
- }
-
break;
case UDN_DELTAPOS: {
@@ -292,11 +273,6 @@ static BOOL CALLBACK
options_appearance_dialog_handler(HWND hwnd,
case IDC_PREFS_FONT_MINSIZE_SPIN:
change_spinner(GetDlgItem(hwnd,
IDC_PREFS_FONT_MINSIZE), 0.1 * ud->iDelta, 1.0, 50.0);
return TRUE;
-
- case IDC_PREFS_ANIMATIONDELAY_SPIN:
- change_spinner(GetDlgItem(hwnd,
IDC_PREFS_ANIMATIONDELAY), 0.1 * ud->iDelta, 0.1, 100.0);
- return TRUE;
-
}
}
break;
diff --git a/frontends/windows/res/resource.rc
b/frontends/windows/res/resource.rc
index 2d9e6cf..9e9927b 100644
--- a/frontends/windows/res/resource.rc
+++ b/frontends/windows/res/resource.rc
@@ -242,9 +242,6 @@ FONT 8, "MS Shell Dlg", 0, 0, 1
LTEXT "Animation", IDC_STATIC, 7, 148, 36, 8, NOT WS_GROUP |
SS_LEFT, WS_EX_LEFT
CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 43, 152, 170,
1, WS_EX_LEFT
AUTOCHECKBOX "Disable", IDC_PREFS_NOANIMATION, 43, 163, 39, 10, 0,
WS_EX_LEFT
- LTEXT "Minimum delay:", IDC_STATIC, 55, 180, 56, 8, SS_LEFT,
WS_EX_LEFT
- EDITTEXT IDC_PREFS_ANIMATIONDELAY, 113, 177, 35, 14, NOT WS_BORDER,
WS_EX_CLIENTEDGE
- CONTROL "Min delay", IDC_PREFS_ANIMATIONDELAY_SPIN, UPDOWN_CLASS,
UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 43, 210, 11, 15, WS_EX_LEFT
}
diff --git a/frontends/windows/resourceid.h b/frontends/windows/resourceid.h
index a0642b1..2933b15 100644
--- a/frontends/windows/resourceid.h
+++ b/frontends/windows/resourceid.h
@@ -88,8 +88,6 @@
#define IDC_PREFS_FANTASY 1219
#define IDC_PREFS_FONTDEF 1220
#define IDC_PREFS_NOANIMATION 1227
-#define IDC_PREFS_ANIMATIONDELAY 1228
-#define IDC_PREFS_ANIMATIONDELAY_SPIN 1229
#define IDD_SSLCERT 1600
#define IDC_SSLCERT_IMG1 1601
diff --git a/test/data/Choices b/test/data/Choices
index a1fc15b..511ecf8 100644
--- a/test/data/Choices
+++ b/test/data/Choices
@@ -30,7 +30,6 @@ disc_cache_size:1073741824
disc_cache_age:28
block_advertisements:0
do_not_track:0
-minimum_gif_delay:10
send_referer:1
foreground_images:1
background_images:1
diff --git a/test/data/Choices-all b/test/data/Choices-all
index b430db5..65a467d 100644
--- a/test/data/Choices-all
+++ b/test/data/Choices-all
@@ -20,7 +20,6 @@ disc_cache_size:1073741824
disc_cache_age:28
block_advertisements:0
do_not_track:0
-minimum_gif_delay:10
send_referer:1
foreground_images:1
background_images:1
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
