From 299b18fb4b0c5381af7017421367fe8fa8f82c68 Mon Sep 17 00:00:00 2001 From: wwp Date: Tue, 5 Mar 2019 12:57:15 +0100 Subject: [PATCH] Review label of webkit menu items in Fancy: remove the '(enable remote content)' not-so-clear mention, and capitalize words to follow other labels. --- src/plugins/fancy/fancy_prefs.c | 4 ++-- src/plugins/fancy/fancy_viewer.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c index 7c553ba4b..3953048a7 100644 --- a/src/plugins/fancy/fancy_prefs.c +++ b/src/plugins/fancy/fancy_prefs.c @@ -167,7 +167,7 @@ static void remote_content_set_labels_cb(GtkWidget *button, FancyPrefsPage *pref if (gtk_tree_model_get_iter_first (model, &iter)) { if (remote_enabled) gtk_list_store_set(GTK_LIST_STORE(model), &iter, COMBOBOX_TEXT, - _("Open in viewer (remote content is enabled)"), -1); + _("Open in Viewer (remote content is enabled)"), -1); else gtk_list_store_set(GTK_LIST_STORE(model), &iter, COMBOBOX_TEXT, _("Do nothing (remote content is disabled)"), -1); @@ -282,7 +282,7 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window, GtkTreeIter iter; COMBOBOX_ADD (menu, "DEFAULT_ACTION", FALSE); - COMBOBOX_ADD (menu, _("Open in external browser"), TRUE); + COMBOBOX_ADD (menu, _("Open in External Browser"), TRUE); gtk_box_pack_start(GTK_BOX(hbox_ext), open_external_label, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(hbox_ext), optmenu_open_external, FALSE, FALSE, 0); diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c index a6eddb2f5..ba3271b58 100644 --- a/src/plugins/fancy/fancy_viewer.c +++ b/src/plugins/fancy/fancy_viewer.c @@ -747,10 +747,7 @@ static void viewer_menu_handler(GtkWidget *menuitem, FancyViewer *viewer) if (!g_ascii_strcasecmp(gtk_label_get_text(GTK_LABEL(menul)), "Open Link" )) { - if (viewer->override_prefs_remote_content) - gtk_label_set_text(GTK_LABEL(menul), _("Open in Viewer")); - else - gtk_label_set_text(GTK_LABEL(menul), _("Open in Viewer (enable remote content)")); + gtk_label_set_text(GTK_LABEL(menul), _("Open in Viewer")); GtkImageMenuItem *m_new = GTK_IMAGE_MENU_ITEM(menuitem); gtk_widget_set_sensitive(GTK_WIDGET(m_new), viewer->override_prefs_remote_content); -- 2.25.1