diff options
| author | Yosef Or Boczko <yoseforb@gmail.com> | 2013-09-02 22:52:59 +0800 |
|---|---|---|
| committer | Yosef Or Boczko <yoseforb@gmail.com> | 2013-09-02 22:52:59 +0800 |
| commit | da5629f13ef69aa9faf9d065fd147f61bef507e3 (patch) | |
| tree | f688c6858ae0b5337a4957d532262a466506ae65 /lib | |
| parent | 7c5b4005450fc59ac287b351c1158f29c36f96a7 (diff) | |
| download | gsoc2013-epiphany-da5629f13ef69aa9faf9d065fd147f61bef507e3.tar gsoc2013-epiphany-da5629f13ef69aa9faf9d065fd147f61bef507e3.tar.gz gsoc2013-epiphany-da5629f13ef69aa9faf9d065fd147f61bef507e3.tar.bz2 gsoc2013-epiphany-da5629f13ef69aa9faf9d065fd147f61bef507e3.tar.lz gsoc2013-epiphany-da5629f13ef69aa9faf9d065fd147f61bef507e3.tar.xz gsoc2013-epiphany-da5629f13ef69aa9faf9d065fd147f61bef507e3.tar.zst gsoc2013-epiphany-da5629f13ef69aa9faf9d065fd147f61bef507e3.zip | |
Drop GtkStock
https://bugzilla.gnome.org/show_bug.cgi?id=707021
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ephy-file-chooser.c | 8 | ||||
| -rw-r--r-- | lib/widgets/ephy-certificate-dialog.c | 2 | ||||
| -rw-r--r-- | lib/widgets/ephy-location-entry.c | 12 |
3 files changed, 8 insertions, 14 deletions
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c index 4f8357578..51ddec7e2 100644 --- a/lib/ephy-file-chooser.c +++ b/lib/ephy-file-chooser.c @@ -181,8 +181,8 @@ ephy_file_chooser_new (const char *title, action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) { gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_Open"), GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); @@ -190,8 +190,8 @@ ephy_file_chooser_new (const char *title, else if (action == GTK_FILE_CHOOSER_ACTION_SAVE) { gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_Save"), GTK_RESPONSE_ACCEPT, NULL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); diff --git a/lib/widgets/ephy-certificate-dialog.c b/lib/widgets/ephy-certificate-dialog.c index a1632cdef..0ca7e1ecb 100644 --- a/lib/widgets/ephy-certificate-dialog.c +++ b/lib/widgets/ephy-certificate-dialog.c @@ -320,7 +320,7 @@ ephy_certificate_dialog_new (GtkWindow *parent, "tls-errors", tls_errors, NULL)); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, + _("_Close"), GTK_RESPONSE_CLOSE, NULL); if (parent) gtk_window_set_transient_for (GTK_WINDOW (dialog), parent); diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c index bb5300e61..0fbf9e48f 100644 --- a/lib/widgets/ephy-location-entry.c +++ b/lib/widgets/ephy-location-entry.c @@ -579,22 +579,16 @@ entry_populate_popup_cb (GtkEntry *entry, EphyLocationEntry *lentry) { EphyLocationEntryPrivate *priv = lentry->priv; - GtkWidget *image; GtkWidget *clear_menuitem, *undo_menuitem, *redo_menuitem, *separator; GList *children, *item; int pos = 0, sep = 0; gboolean is_editable; - /* Clear and Copy mnemonics conflict, make custom menuitem */ - image = gtk_image_new_from_stock (GTK_STOCK_CLEAR, GTK_ICON_SIZE_MENU); - gtk_widget_show (image); - /* Translators: the mnemonic shouldn't conflict with any of the * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, * Select All, Input Methods and Insert Unicode control character.) */ - clear_menuitem = gtk_image_menu_item_new_with_mnemonic (_("Cl_ear")); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clear_menuitem), image); + clear_menuitem = gtk_menu_item_new_with_mnemonic (_("Cl_ear")); g_signal_connect (clear_menuitem , "activate", G_CALLBACK (entry_clear_activate_cb), lentry); is_editable = gtk_editable_get_editable (GTK_EDITABLE (entry)); @@ -613,14 +607,14 @@ entry_populate_popup_cb (GtkEntry *entry, gtk_menu_shell_insert (GTK_MENU_SHELL (menu), clear_menuitem, pos - 1); - undo_menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_UNDO, NULL); + undo_menuitem = gtk_menu_item_new_with_mnemonic (_("_Undo")); gtk_widget_set_sensitive (undo_menuitem, priv->user_changed); g_signal_connect (undo_menuitem, "activate", G_CALLBACK (entry_undo_activate_cb), lentry); gtk_widget_show (undo_menuitem); gtk_menu_shell_insert (GTK_MENU_SHELL (menu), undo_menuitem, 0); - redo_menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_REDO, NULL); + redo_menuitem = gtk_menu_item_new_with_mnemonic (_("_Redo")); gtk_widget_set_sensitive (redo_menuitem, priv->can_redo); g_signal_connect (redo_menuitem, "activate", G_CALLBACK (entry_redo_activate_cb), lentry); |