From 906ccf632de8f5b6a51036183120d504c574b460 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Sun, 10 May 2009 16:07:28 +0200 Subject: [PATCH] Go back to referring to Speed Dial in the user interface The term customized homepage is somewhat unclear and speed dial is known from phones and other browsers. --- midori/midori-browser.c | 18 +++++++++--------- midori/midori-preferences.c | 2 +- midori/midori-view.c | 16 ++++++++-------- midori/midori-websettings.c | 25 +++++++++++++------------ 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/midori/midori-browser.c b/midori/midori-browser.c index 8a9156b4..892250f7 100644 --- a/midori/midori-browser.c +++ b/midori/midori-browser.c @@ -86,7 +86,7 @@ struct _MidoriBrowser gboolean show_navigationbar; gboolean show_statusbar; - gboolean customized_homepage_in_new_tabs; + gboolean speed_dial_in_new_tabs; gboolean progress_in_location; gboolean remember_last_visited_pages; gchar* location_entry_search; @@ -250,7 +250,7 @@ _midori_browser_update_interface (MidoriBrowser* browser) midori_view_can_go_forward (MIDORI_VIEW (view))); gtk_action_set_visible (_action_by_name (browser, "AddSpeedDial"), - browser->customized_homepage_in_new_tabs); + browser->speed_dial_in_new_tabs); /* Currently views that don't support source, don't support saving either. If that changes, we need to think of something. */ _action_set_sensitive (browser, "SaveAs", @@ -482,7 +482,7 @@ midori_view_notify_load_status_cb (GtkWidget* view, MIDORI_LOCATION_ACTION (action), NULL); g_object_notify (G_OBJECT (browser), "uri"); } - if (browser->customized_homepage_in_new_tabs) + if (browser->speed_dial_in_new_tabs) midori_browser_update_thumbnail (view, uri); _midori_browser_update_interface (browser); @@ -3681,7 +3681,7 @@ gtk_notebook_switch_page_cb (GtkWidget* notebook, _midori_browser_update_interface (browser); _midori_browser_update_progress (browser, MIDORI_VIEW (view)); - if (browser->customized_homepage_in_new_tabs) + if (browser->speed_dial_in_new_tabs) midori_browser_update_thumbnail (view, uri); } @@ -3761,8 +3761,8 @@ static const GtkActionEntry entries[] = { NULL, "s", N_("Save to a file"), G_CALLBACK (_action_save_as_activate) }, { "AddSpeedDial", NULL, - N_("Add to customize _homepage"), "h", - N_("Add shortcut to customized _homepage"), G_CALLBACK (_action_add_speed_dial_activate) }, + N_("Add to Speed _dial"), "h", + N_("Add shortcut to speed dial"), G_CALLBACK (_action_add_speed_dial_activate) }, { "TabClose", NULL, N_("_Close Tab"), "w", N_("Close the current tab"), G_CALLBACK (_action_tab_close_activate) }, @@ -4949,7 +4949,7 @@ _midori_browser_update_settings (MidoriBrowser* browser) "show-panel", &show_panel, "show-transferbar", &show_transferbar, "show-statusbar", &browser->show_statusbar, - "customized-homepage-in-new-tabs", &browser->customized_homepage_in_new_tabs, + "speed-dial-in-new-tabs", &browser->speed_dial_in_new_tabs, "toolbar-style", &toolbar_style, "toolbar-items", &toolbar_items, "last-web-search", &last_web_search, @@ -5056,8 +5056,8 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings, browser->show_navigationbar = g_value_get_boolean (&value); else if (name == g_intern_string ("show-statusbar")) browser->show_statusbar = g_value_get_boolean (&value); - else if (name == g_intern_string ("customized-homepage-in-new-tabs")) - browser->customized_homepage_in_new_tabs = g_value_get_boolean (&value); + else if (name == g_intern_string ("speed-dial-in-new-tabs")) + browser->speed_dial_in_new_tabs = g_value_get_boolean (&value); else if (name == g_intern_string ("progress-in-location")) browser->progress_in_location = g_value_get_boolean (&value); else if (name == g_intern_string ("search-engines-in-completion")) diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index 3ce064fe..f3897345 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -420,7 +420,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, FILLED_ADD (hbox, 1, 2, 1, 2); button = katze_property_proxy (settings, "show-crash-dialog", NULL); INDENTED_ADD (button, 0, 1, 2, 3); - button = katze_property_proxy (settings, "customized-homepage-in-new-tabs", NULL); + button = katze_property_proxy (settings, "speed-dial-in-new-tabs", NULL); FILLED_ADD (button, 1, 2, 2, 3); FRAME_NEW (_("Transfers")); TABLE_NEW (2, 2); diff --git a/midori/midori-view.c b/midori/midori-view.c index a5f71f59..3fb02fb6 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -60,7 +60,7 @@ struct _MidoriView GtkWidget* web_view; KatzeArray* news_feeds; - gboolean customized_homepage_in_new_tabs; + gboolean speed_dial_in_new_tabs; gchar* download_manager; gchar* news_aggregator; gboolean middle_click_opens_selection; @@ -1251,9 +1251,9 @@ webkit_web_view_populate_popup_cb (WebKitWebView* web_view, G_CALLBACK (midori_web_view_menu_action_activate_cb), view); gtk_widget_show (menuitem); - if (view->customized_homepage_in_new_tabs) + if (view->speed_dial_in_new_tabs) { - menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to customized _homepage")); + menuitem = gtk_image_menu_item_new_with_mnemonic (_("Add to Speed _dial")); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); g_object_set_data (G_OBJECT (menuitem), "action", "AddSpeedDial"); g_signal_connect (menuitem, "activate", @@ -1659,7 +1659,7 @@ _midori_view_update_settings (MidoriView* view) gboolean zoom_text_and_images; g_object_get (view->settings, - "customized-homepage-in-new-tabs", &view->customized_homepage_in_new_tabs, + "speed-dial-in-new-tabs", &view->speed_dial_in_new_tabs, "download-manager", &view->download_manager, "news-aggregator", &view->news_aggregator, "zoom-text-and-images", &zoom_text_and_images, @@ -1687,9 +1687,9 @@ midori_view_settings_notify_cb (MidoriWebSettings* settings, g_value_init (&value, pspec->value_type); g_object_get_property (G_OBJECT (view->settings), name, &value); - if (name == g_intern_string ("customized-homepage-in-new-tabs")) + if (name == g_intern_string ("speed-dial-in-new-tabs")) { - view->customized_homepage_in_new_tabs = g_value_get_boolean (&value); + view->speed_dial_in_new_tabs = g_value_get_boolean (&value); } else if (name == g_intern_string ("download-manager")) { @@ -1955,7 +1955,7 @@ midori_view_set_uri (MidoriView* view, if (!view->web_view) midori_view_construct_web_view (view); - if (view->customized_homepage_in_new_tabs && !g_strcmp0 (uri, "")) + if (view->speed_dial_in_new_tabs && !g_strcmp0 (uri, "")) { SoupServer* res_server; guint port; @@ -2002,7 +2002,7 @@ midori_view_set_uri (MidoriView* view, "{search}", _("Search"), "{click_to_add}", _("Click to add a shortcut"), "{enter_shortcut_address}", _("Enter shortcut address"), - "{enter_shortcut_name}", _("Enter shortcut name"), + "{enter_shortcut_name}", _("Enter shortcut title"), "{are_you_sure}", _("Are you sure you want to delete this shortcut?"), NULL); diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c index e7bcb6ed..49c4304d 100644 --- a/midori/midori-websettings.c +++ b/midori/midori-websettings.c @@ -49,7 +49,7 @@ struct _MidoriWebSettings MidoriStartup load_on_startup; gchar* homepage; gboolean show_crash_dialog; - gboolean customized_homepage_in_new_tabs; + gboolean speed_dial_in_new_tabs; gchar* download_folder; gboolean ask_for_destination_folder; gboolean notify_transfer_completed; @@ -122,7 +122,7 @@ enum PROP_LOAD_ON_STARTUP, PROP_HOMEPAGE, PROP_SHOW_CRASH_DIALOG, - PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS, + PROP_SPEED_DIAL_IN_NEW_TABS, PROP_DOWNLOAD_FOLDER, PROP_ASK_FOR_DESTINATION_FOLDER, PROP_NOTIFY_TRANSFER_COMPLETED, @@ -574,18 +574,19 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) flags)); /** - * MidoriWebSettings:customized-homepage-in-new-tabs: + * MidoriWebSettings:speed-dial-in-new-tabs: * - * Show a customized homepage in newly opened tabs. + * Show spee dial in newly opened tabs. * * Since: 0.1.7 */ g_object_class_install_property (gobject_class, - PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS, + PROP_SPEED_DIAL_IN_NEW_TABS, g_param_spec_boolean ( - "customized-homepage-in-new-tabs", - _("Show customized homepage in new tabs"), - _("Show a customized homepage in newly opened tabs"), + "speed-dial-in-new-tabs", + /* i18n: Speed dial, webpage shortcuts, named for the phone function */ + _("Show speed dial in new tabs"), + _("Show speed dial in newly opened tabs"), TRUE, flags)); @@ -1137,8 +1138,8 @@ midori_web_settings_set_property (GObject* object, case PROP_SHOW_CRASH_DIALOG: web_settings->show_crash_dialog = g_value_get_boolean (value); break; - case PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS: - web_settings->customized_homepage_in_new_tabs = g_value_get_boolean (value); + case PROP_SPEED_DIAL_IN_NEW_TABS: + web_settings->speed_dial_in_new_tabs = g_value_get_boolean (value); break; case PROP_DOWNLOAD_FOLDER: katze_assign (web_settings->download_folder, g_value_dup_string (value)); @@ -1345,8 +1346,8 @@ midori_web_settings_get_property (GObject* object, case PROP_SHOW_CRASH_DIALOG: g_value_set_boolean (value, web_settings->show_crash_dialog); break; - case PROP_CUSTOMIZED_HOMEPAGE_IN_NEW_TABS: - g_value_set_boolean (value, web_settings->customized_homepage_in_new_tabs); + case PROP_SPEED_DIAL_IN_NEW_TABS: + g_value_set_boolean (value, web_settings->speed_dial_in_new_tabs); break; case PROP_DOWNLOAD_FOLDER: g_value_set_string (value, web_settings->download_folder);