diff options
author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2006-08-05 14:38:47 +0800 |
---|---|---|
committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2006-08-05 14:38:47 +0800 |
commit | a00b972e5a9e3e7131fbf38538d42ecfeca8740c (patch) | |
tree | 5064d92515442e1efe5fcb7e28c7891e09c588eb /mail | |
parent | 9f6f6f39aabb789354cf437cf9d8e2f1f470efe3 (diff) | |
download | gsoc2013-evolution-a00b972e5a9e3e7131fbf38538d42ecfeca8740c.tar.gz gsoc2013-evolution-a00b972e5a9e3e7131fbf38538d42ecfeca8740c.tar.zst gsoc2013-evolution-a00b972e5a9e3e7131fbf38538d42ecfeca8740c.zip |
Committed Johnny's string changes for search
svn path=/trunk/; revision=32474
Diffstat (limited to 'mail')
-rw-r--r-- | mail/ChangeLog | 7 | ||||
-rw-r--r-- | mail/em-folder-browser.c | 5 | ||||
-rw-r--r-- | mail/em-format-html-display.c | 7 |
3 files changed, 16 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 5c22f2a96e..9c07b96ed5 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2006-08-04 Johnny Jacob <jjohnny@novell.com> + + * em-format-html-display.c : Added mnemonic for "Fi_nd" and + "Fo_rward". + * em-folder-browser.c : (get_view_query) : Added query for + "messages masrked as important" + 2006-08-02 Srinivasa Ragavan <sragavan@novell.com> ** Fixes bug #335241 diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 06117538c5..3950640c98 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -175,6 +175,7 @@ enum { VIEW_NO_LABEL, VIEW_LABEL, VIEW_ANY_FIELD_CONTAINS, + VIEW_MESSAGES_MARKED_AS_IMPORTANT, VIEW_CUSTOMIZE }; @@ -194,6 +195,7 @@ static ESearchBarItem temp_view_items[] = { { N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, { N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, { N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, + { N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, { N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, /* { NULL, 0, NULL }, */ /* { N_("Customize"), NOT_IMPLEMENTED, NULL }, */ @@ -764,6 +766,9 @@ get_view_query (ESearchBar *esb) tag = (char *)g_object_get_data (G_OBJECT (menu_item), "LabelTag"); view_sexp = g_strdup_printf ("(match-all (= (user-tag \"label\") \"%s\"))",tag); break; + case VIEW_MESSAGES_MARKED_AS_IMPORTANT: + view_sexp = "(match-all (system-flag \"Flagged\"))"; + break; case VIEW_ANY_FIELD_CONTAINS: break; diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 70131b91da..cb184e8692 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -643,13 +643,14 @@ em_format_html_get_search_dialog (EMFormatHTMLDisplay *efhd) p->search_entry_box = gtk_hbox_new (FALSE, 0); - label1 = gtk_label_new (_("Find:")); + label1 = gtk_label_new_with_mnemonic (_("Fi_nd:")); gtk_widget_show (label1); gtk_box_pack_start ((GtkBox *)(p->search_entry_box), label1, FALSE, FALSE, 5); /* Icon entry */ icon_entry = e_icon_entry_new (); p->search_entry = e_icon_entry_get_entry (E_ICON_ENTRY (icon_entry)); + gtk_label_set_mnemonic_widget (label1, p->search_entry); gtk_widget_show (p->search_entry); clear_button = e_icon_entry_create_button ("gtk-clear"); e_icon_entry_pack_widget (E_ICON_ENTRY (icon_entry), clear_button, FALSE); @@ -670,7 +671,8 @@ em_format_html_get_search_dialog (EMFormatHTMLDisplay *efhd) gtk_widget_show (button3); gtk_box_pack_start ((GtkBox *)(hbox2), button3, FALSE, FALSE, 5); - button2 = gtk_button_new_from_stock ("gtk-go-forward"); + button2 = gtk_button_new_with_mnemonic (_("Fo_rward")); + gtk_button_set_image (button2, gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON)); gtk_widget_show (button2); gtk_box_pack_start ((GtkBox *)(hbox2), button2, FALSE, FALSE, 5); @@ -745,7 +747,6 @@ void em_format_html_display_search_with (EMFormatHTMLDisplay *efhd, char *word) { struct _EMFormatHTMLDisplayPrivate *p = efhd->priv; - char *str; if (p->search_dialog){ GtkWidget *toplevel; |