Review label of webkit menu items in Fancy: remove the '(enable
authorwwp <subscript@free.fr>
Tue, 5 Mar 2019 11:57:15 +0000 (12:57 +0100)
committerwwp <subscript@free.fr>
Tue, 5 Mar 2019 11:57:15 +0000 (12:57 +0100)
remote content)' not-so-clear mention, and capitalize words to
follow other labels.

src/plugins/fancy/fancy_prefs.c
src/plugins/fancy/fancy_viewer.c

index 7c553ba4b24b894007a7e53656952baadb7754ed..3953048a74f1ffb4ce26d0c57672c54623b13f7e 100644 (file)
@@ -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);
index a6eddb2f5e8802d9964d45eda56a0ce17c230a07..ba3271b58a56e67297d906b8b1b1770f136b2cf5 100644 (file)
@@ -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);