From 5eb703af733f49f743eabbea6783bc74de95ebc5 Mon Sep 17 00:00:00 2001 From: Richard Wilson Date: Mon, 3 Jul 2006 01:03:07 +0000 Subject: Allow thumbnail icons to be turned off. svn path=/trunk/netsurf/; revision=2699 --- !NetSurf/Resources/de/Messages | 7 ++++--- !NetSurf/Resources/de/Templates,fec | Bin 18337 -> 18501 bytes !NetSurf/Resources/en/Messages | 7 ++++--- !NetSurf/Resources/en/Templates,fec | Bin 18266 -> 18430 bytes !NetSurf/Resources/fr/Messages | 7 ++++--- !NetSurf/Resources/fr/Templates,fec | Bin 18449 -> 18613 bytes !NetSurf/Resources/nl/Messages | 7 ++++--- !NetSurf/Resources/nl/Templates,fec | Bin 18352 -> 18516 bytes riscos/configure/con_inter.c | 13 ++++++++++--- riscos/gui.c | 4 ++++ riscos/options.h | 7 +++++-- 11 files changed, 35 insertions(+), 17 deletions(-) diff --git a/!NetSurf/Resources/de/Messages b/!NetSurf/Resources/de/Messages index edc8cea7c..fc8e63f6f 100644 --- a/!NetSurf/Resources/de/Messages +++ b/!NetSurf/Resources/de/Messages @@ -816,9 +816,10 @@ HelpInterfaceConfig2:This indicates whether NetSurf will strip file extensions w HelpInterfaceConfig3:This indicates whether NetSurf will ask for confirmation before overwriting files of the same name. HelpInterfaceConfig6:This indicates whether NetSurf's URL suggestion feature is enabled.|MURL suggestion shows options for completing URLs as you type into NetSurf's URL bar. HelpInterfaceConfig7:This indicates whether the URL for the item under the pointer in NetSurf's local history \w will be displayed. -HelpInterfaceConfig8:\Sreset the Interface options back to their default values. -HelpInterfaceConfig9:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. -HelpInterfaceConfig10:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. +HelpInterfaceConfig10:This indicates whether NetSurf will use a thumbnail when iconising windows to the Pinboard. +HelpInterfaceConfig11:\Sreset the Interface options back to their default values. +HelpInterfaceConfig12:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. +HelpInterfaceConfig13:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. HelpLanguageConfig:\Tlanguage configuration \w HelpLanguageConfig3:\Tcurrently selected interface language.|MThe interface language is the language used for NetSurf's messages and dialogue boxes. diff --git a/!NetSurf/Resources/de/Templates,fec b/!NetSurf/Resources/de/Templates,fec index 70df00f9e..8ed50955b 100755 Binary files a/!NetSurf/Resources/de/Templates,fec and b/!NetSurf/Resources/de/Templates,fec differ diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages index be851dcd8..9c048633a 100644 --- a/!NetSurf/Resources/en/Messages +++ b/!NetSurf/Resources/en/Messages @@ -816,9 +816,10 @@ HelpInterfaceConfig2:This indicates whether NetSurf will strip file extensions w HelpInterfaceConfig3:This indicates whether NetSurf will ask for confirmation before overwriting files of the same name. HelpInterfaceConfig6:This indicates whether NetSurf's URL suggestion feature is enabled.|MURL suggestion shows options for completing URLs as you type into NetSurf's URL bar. HelpInterfaceConfig7:This indicates whether the URL for the item under the pointer in NetSurf's local history \w will be displayed. -HelpInterfaceConfig8:\Sreset the Interface options back to their default values. -HelpInterfaceConfig9:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. -HelpInterfaceConfig10:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. +HelpInterfaceConfig10:This indicates whether NetSurf will use a thumbnail when iconising windows to the Pinboard. +HelpInterfaceConfig11:\Sreset the Interface options back to their default values. +HelpInterfaceConfig12:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. +HelpInterfaceConfig13:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. HelpLanguageConfig:\Tlanguage configuration \w HelpLanguageConfig3:\Tcurrently selected interface language.|MThe interface language is the language used for NetSurf's messages and dialogue boxes. diff --git a/!NetSurf/Resources/en/Templates,fec b/!NetSurf/Resources/en/Templates,fec index b02ce6ea9..b241bc9c3 100644 Binary files a/!NetSurf/Resources/en/Templates,fec and b/!NetSurf/Resources/en/Templates,fec differ diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages index cc63b92f2..24b47cd80 100644 --- a/!NetSurf/Resources/fr/Messages +++ b/!NetSurf/Resources/fr/Messages @@ -816,9 +816,10 @@ HelpInterfaceConfig2:This indicates whether NetSurf will strip file extensions w HelpInterfaceConfig3:This indicates whether NetSurf will ask for confirmation before overwriting files of the same name. HelpInterfaceConfig6:This indicates whether NetSurf's URL suggestion feature is enabled.|MURL suggestion shows options for completing URLs as you type into NetSurf's URL bar. HelpInterfaceConfig7:This indicates whether the URL for the item under the pointer in NetSurf's local history \w will be displayed. -HelpInterfaceConfig8:\Sreset the Interface options back to their default values. -HelpInterfaceConfig9:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. -HelpInterfaceConfig10:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. +HelpInterfaceConfig10:This indicates whether NetSurf will use a thumbnail when iconising windows to the Pinboard. +HelpInterfaceConfig11:\Sreset the Interface options back to their default values. +HelpInterfaceConfig12:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. +HelpInterfaceConfig13:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. HelpLanguageConfig:\Tlanguage configuration \w HelpLanguageConfig3:\Tcurrently selected interface language.|MThe interface language is the language used for NetSurf's messages and dialogue boxes. diff --git a/!NetSurf/Resources/fr/Templates,fec b/!NetSurf/Resources/fr/Templates,fec index 5b139cebe..9ef8e532f 100644 Binary files a/!NetSurf/Resources/fr/Templates,fec and b/!NetSurf/Resources/fr/Templates,fec differ diff --git a/!NetSurf/Resources/nl/Messages b/!NetSurf/Resources/nl/Messages index 1a883c177..d48df0c75 100644 --- a/!NetSurf/Resources/nl/Messages +++ b/!NetSurf/Resources/nl/Messages @@ -816,9 +816,10 @@ HelpInterfaceConfig2:This indicates whether NetSurf will strip file extensions w HelpInterfaceConfig3:This indicates whether NetSurf will ask for confirmation before overwriting files of the same name. HelpInterfaceConfig6:This indicates whether NetSurf's URL suggestion feature is enabled.|MURL suggestion shows options for completing URLs as you type into NetSurf's URL bar. HelpInterfaceConfig7:This indicates whether the URL for the item under the pointer in NetSurf's local history \w will be displayed. -HelpInterfaceConfig8:\Sreset the Interface options back to their default values. -HelpInterfaceConfig9:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. -HelpInterfaceConfig10:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. +HelpInterfaceConfig10:This indicates whether NetSurf will use a thumbnail when iconising windows to the Pinboard. +HelpInterfaceConfig11:\Sreset the Interface options back to their default values. +HelpInterfaceConfig12:\Sclose this \w without saving changes.|M\Areturn the cache options to the last saved configuration. +HelpInterfaceConfig13:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. HelpLanguageConfig:\Tlanguage configuration \w HelpLanguageConfig3:\Tcurrently selected interface language.|MThe interface language is the language used for NetSurf's messages and dialogue boxes. diff --git a/!NetSurf/Resources/nl/Templates,fec b/!NetSurf/Resources/nl/Templates,fec index 43fa03f97..2d2133963 100644 Binary files a/!NetSurf/Resources/nl/Templates,fec and b/!NetSurf/Resources/nl/Templates,fec differ diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c index 25619cd2c..84d48bb85 100644 --- a/riscos/configure/con_inter.c +++ b/riscos/configure/con_inter.c @@ -18,9 +18,10 @@ #define INTERFACE_CONFIRM_OVWR_OPTION 3 #define INTERFACE_URL_COMPLETE_OPTION 6 #define INTERFACE_HISTORY_TOOLTIP_OPTION 7 -#define INTERFACE_DEFAULT_BUTTON 8 -#define INTERFACE_CANCEL_BUTTON 9 -#define INTERFACE_OK_BUTTON 10 +#define INTERFACE_THUMBNAIL_ICONISE_OPTION 10 +#define INTERFACE_DEFAULT_BUTTON 11 +#define INTERFACE_CANCEL_BUTTON 12 +#define INTERFACE_OK_BUTTON 13 static void ro_gui_options_interface_default(wimp_pointer *pointer); @@ -37,6 +38,8 @@ bool ro_gui_options_interface_initialise(wimp_w w) { option_url_suggestion); ro_gui_set_icon_selected_state(w, INTERFACE_HISTORY_TOOLTIP_OPTION, option_history_tooltip); + ro_gui_set_icon_selected_state(w, INTERFACE_THUMBNAIL_ICONISE_OPTION, + option_thumbnail_iconise); /* initialise all functions for a newly created window */ ro_gui_wimp_event_register_button(w, INTERFACE_DEFAULT_BUTTON, @@ -60,6 +63,8 @@ void ro_gui_options_interface_default(wimp_pointer *pointer) { INTERFACE_URL_COMPLETE_OPTION, true); ro_gui_set_icon_selected_state(pointer->w, INTERFACE_HISTORY_TOOLTIP_OPTION, true); + ro_gui_set_icon_selected_state(pointer->w, + INTERFACE_THUMBNAIL_ICONISE_OPTION, true); } bool ro_gui_options_interface_ok(wimp_w w) { @@ -72,6 +77,8 @@ bool ro_gui_options_interface_ok(wimp_w w) { INTERFACE_URL_COMPLETE_OPTION); option_history_tooltip = ro_gui_get_icon_selected_state(w, INTERFACE_HISTORY_TOOLTIP_OPTION); + option_thumbnail_iconise = ro_gui_get_icon_selected_state(w, + INTERFACE_THUMBNAIL_ICONISE_OPTION); ro_gui_save_options(); return true; diff --git a/riscos/gui.c b/riscos/gui.c index 925659265..9ffa05c0b 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -1988,6 +1988,10 @@ void ro_msg_window_info(wimp_message *message) wimp_full_message_window_info *wi; struct gui_window *g; + /* allow the user to turn off thumbnail icons */ + if (!option_thumbnail_iconise) + return; + wi = (wimp_full_message_window_info*)message; g = ro_gui_window_lookup(wi->w); diff --git a/riscos/options.h b/riscos/options.h index a968fcd89..176924b8f 100644 --- a/riscos/options.h +++ b/riscos/options.h @@ -59,6 +59,7 @@ extern char *option_recent_path; extern char *option_recent_save; extern char *option_theme_path; extern char *option_theme_save; +extern bool option_thumbnail_iconise; #define EXTRA_OPTION_DEFINE \ bool option_use_mouse_gestures = false;\ @@ -103,7 +104,8 @@ char *option_hotlist_save = 0; \ char *option_recent_path = 0; \ char *option_recent_save = 0; \ char *option_theme_path = 0; \ -char *option_theme_save = 0; +char *option_theme_save = 0; \ +bool option_thumbnail_iconise = true; #define EXTRA_OPTION_TABLE \ { "use_mouse_gestures", OPTION_BOOL, &option_use_mouse_gestures },\ @@ -148,6 +150,7 @@ char *option_theme_save = 0; { "recent_path", OPTION_STRING, &option_recent_path }, \ { "recent_save", OPTION_STRING, &option_recent_save }, \ { "theme_path", OPTION_STRING, &option_theme_path }, \ -{ "theme_save", OPTION_STRING, &option_theme_save } +{ "theme_save", OPTION_STRING, &option_theme_save }, \ +{ "thumbnail_iconise", OPTION_BOOL, &option_thumbnail_iconise } #endif -- cgit v1.2.3