From 407e4dd5d3d91533c89e97cc0d9af985d6bf2221 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 23 Dec 2009 16:24:51 +0100 Subject: [PATCH] Enable web inspector by default and remove the preference Apparently the web inspector is not discoverable and a lot of people who would use it, are not aware of its existence. So we enable it by default. --- midori/midori-preferences.c | 14 ++++++-------- midori/midori-websettings.c | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index a2c58c4d..f80b31c0 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -400,19 +400,17 @@ midori_preferences_set_settings (MidoriPreferences* preferences, INDENTED_ADD (button); button = katze_property_proxy (settings, "enable-plugins", NULL); SPANNED_ADD (button); - button = katze_property_proxy (settings, "enforce-96-dpi", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enforce 96 dots per inch")); - gtk_widget_set_tooltip_text (button, _("Enforce a video dot density of 96 DPI")); - INDENTED_ADD (button); - button = katze_property_proxy (settings, "enable-developer-extras", NULL); - gtk_button_set_label (GTK_BUTTON (button), _("Enable developer tools")); - gtk_widget_set_tooltip_text (button, _("Enable special extensions for developers")); - SPANNED_ADD (button); #endif button = katze_property_proxy (settings, "zoom-text-and-images", NULL); INDENTED_ADD (button); button = katze_property_proxy (settings, "find-while-typing", NULL); SPANNED_ADD (button); + #if !HAVE_HILDON + button = katze_property_proxy (settings, "enforce-96-dpi", NULL); + gtk_button_set_label (GTK_BUTTON (button), _("Enforce 96 dots per inch")); + gtk_widget_set_tooltip_text (button, _("Enforce a video dot density of 96 DPI")); + INDENTED_ADD (button); + #endif #if WEBKIT_CHECK_VERSION (1, 1, 6) FRAME_NEW (_("Spell Checking")); /* FIXME: Provide a nice dictionary selection */ diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index 6fb0ea6a..b64145fd 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -153,6 +153,7 @@ enum PROP_AUTO_LOAD_IMAGES, PROP_ENABLE_SCRIPTS, PROP_ENABLE_PLUGINS, + PROP_ENABLE_DEVELOPER_EXTRAS, PROP_ZOOM_TEXT_AND_IMAGES, PROP_FIND_WHILE_TYPING, PROP_KINETIC_SCROLLING, @@ -847,6 +848,15 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Enable embedded Netscape plugin objects"), TRUE, flags)); + /* Override properties to override defaults */ + g_object_class_install_property (gobject_class, + PROP_ENABLE_DEVELOPER_EXTRAS, + g_param_spec_boolean ( + "enable-developer-extras", + "Enable developer tools", + "Enable special extensions for developers", + TRUE, + flags)); /** * MidoriWebSettings:zoom-text-and-images: @@ -1376,6 +1386,10 @@ midori_web_settings_set_property (GObject* object, g_object_set (web_settings, "WebKitWebSettings::enable-plugins", g_value_get_boolean (value), NULL); break; + case PROP_ENABLE_DEVELOPER_EXTRAS: + g_object_set (web_settings, "WebKitWebSettings::enable-developer-extras", + g_value_get_boolean (value), NULL); + break; case PROP_ZOOM_TEXT_AND_IMAGES: web_settings->zoom_text_and_images = g_value_get_boolean (value); break; @@ -1591,6 +1605,10 @@ midori_web_settings_get_property (GObject* object, g_value_set_boolean (value, katze_object_get_boolean (web_settings, "WebKitWebSettings::enable-plugins")); break; + case PROP_ENABLE_DEVELOPER_EXTRAS: + g_value_set_boolean (value, katze_object_get_boolean (web_settings, + "WebKitWebSettings::enable-developer-extras")); + break; case PROP_ZOOM_TEXT_AND_IMAGES: g_value_set_boolean (value, web_settings->zoom_text_and_images); break; -- 2.39.5