From 3fdbef0566a4310dc2567c101b38e9c1667d883e Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 21 Dec 2019 20:50:00 +0000 Subject: remove unused render_resample option from beos, gtk and monkey frontends --- docs/netsurf-fb.1 | 3 --- docs/netsurf-gtk.1 | 2 -- frontends/beos/options.h | 5 ++--- frontends/gtk/options.h | 3 --- frontends/gtk/preferences.c | 3 --- frontends/gtk/res/options.gtk2.ui | 18 +----------------- frontends/gtk/res/options.gtk3.ui | 22 +--------------------- frontends/monkey/options.h | 5 ++--- test/data/Choices | 1 - test/data/Choices-all | 1 - 10 files changed, 6 insertions(+), 57 deletions(-) diff --git a/docs/netsurf-fb.1 b/docs/netsurf-fb.1 index e9d721ca5..aa30ab36f 100644 --- a/docs/netsurf-fb.1 +++ b/docs/netsurf-fb.1 @@ -302,9 +302,6 @@ Override CSS sys_colour_WindowFrame colour. .B \-\-sys_colour_WindowText Override CSS sys_colour_WindowText colour. .TP -.B \-\-render_resample -render resample -.TP .B \-\-downloads_clear downloads clear .TP diff --git a/docs/netsurf-gtk.1 b/docs/netsurf-gtk.1 index daa014830..10f0ae570 100644 --- a/docs/netsurf-gtk.1 +++ b/docs/netsurf-gtk.1 @@ -205,8 +205,6 @@ Override CSS sys_colour_Window colour. Override CSS sys_colour_WindowFrame colour. .It Fl -sys_colour_WindowText Override CSS sys_colour_WindowText colour. -.It Fl -render_resample -render resample .It Fl -downloads_clear downloads clear .It Fl -request_overwrite diff --git a/frontends/beos/options.h b/frontends/beos/options.h index 40d23a3bc..f959442f7 100644 --- a/frontends/beos/options.h +++ b/frontends/beos/options.h @@ -18,13 +18,12 @@ */ -#ifndef _NETSURF_BEOS_OPTIONS_H_ -#define _NETSURF_BEOS_OPTIONS_H_ +#ifndef NETSURF_BEOS_OPTIONS_H_ +#define NETSURF_BEOS_OPTIONS_H_ /* currently nothing here */ #endif -NSOPTION_BOOL(render_resample, false) NSOPTION_STRING(url_file, NULL) diff --git a/frontends/gtk/options.h b/frontends/gtk/options.h index 81457efc0..7fd79d7c5 100644 --- a/frontends/gtk/options.h +++ b/frontends/gtk/options.h @@ -23,9 +23,6 @@ #endif -/* High quality image scaling */ -NSOPTION_BOOL(render_resample, true) - /* clear downloads */ NSOPTION_BOOL(downloads_clear, false) diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c index 5fe945073..8ec41ca2c 100644 --- a/frontends/gtk/preferences.c +++ b/frontends/gtk/preferences.c @@ -412,9 +412,6 @@ TOGGLEBUTTON_SIGNALS(checkHideAdverts, block_advertisements) /* enable javascript */ TOGGLEBUTTON_SIGNALS(checkEnableJavascript, enable_javascript) -/* high quality image scaling */ -TOGGLEBUTTON_SIGNALS(checkResampleImages, render_resample) - /* load and display of images */ G_MODULE_EXPORT void nsgtk_preferences_comboboxLoadImages_changed(GtkComboBox *combo, diff --git a/frontends/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui index f30abeb49..ed596c0f0 100644 --- a/frontends/gtk/res/options.gtk2.ui +++ b/frontends/gtk/res/options.gtk2.ui @@ -1142,22 +1142,6 @@ 2 - - - preferencesControlHigh - True - True - False - True - - - - - True - True - 3 - - True @@ -1199,7 +1183,7 @@ True True - 4 + 3 diff --git a/frontends/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui index b74846cb2..af0dd5cd0 100644 --- a/frontends/gtk/res/options.gtk3.ui +++ b/frontends/gtk/res/options.gtk3.ui @@ -982,26 +982,6 @@ 2 - - - preferencesControlHigh - False - True - True - False - start - False - 0.5 - True - - - - - True - True - 3 - - True @@ -1044,7 +1024,7 @@ True True - 4 + 3 diff --git a/frontends/monkey/options.h b/frontends/monkey/options.h index a39e54b3f..8f6dd8b42 100644 --- a/frontends/monkey/options.h +++ b/frontends/monkey/options.h @@ -16,14 +16,13 @@ * along with this program. If not, see . */ -#ifndef _NETSURF_MONKEY_OPTIONS_H_ -#define _NETSURF_MONKEY_OPTIONS_H_ +#ifndef NETSURF_MONKEY_OPTIONS_H_ +#define NETSURF_MONKEY_OPTIONS_H_ /* currently nothing here */ #endif -NSOPTION_BOOL(render_resample, true) NSOPTION_BOOL(downloads_clear, false) NSOPTION_BOOL(request_overwrite, true) NSOPTION_STRING(downloads_directory, NULL) diff --git a/test/data/Choices b/test/data/Choices index 8ca4becf6..a1fc15bde 100644 --- a/test/data/Choices +++ b/test/data/Choices @@ -99,7 +99,6 @@ sys_colour_ThreeDShadow:000000 sys_colour_Window:000000 sys_colour_WindowFrame:000000 sys_colour_WindowText:000000 -render_resample:1 downloads_clear:0 request_overwrite:1 downloads_directory:/home/vince diff --git a/test/data/Choices-all b/test/data/Choices-all index 2742339d0..b430db541 100644 --- a/test/data/Choices-all +++ b/test/data/Choices-all @@ -95,7 +95,6 @@ sys_colour_WindowFrame:4e4e4e sys_colour_WindowText:000000 log_filter:level:WARNING verbose_filter:level:DEBUG -render_resample:1 downloads_clear:0 request_overwrite:1 downloads_directory:/home/vince -- cgit v1.2.3