aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/cal-search-bar.c1
-rw-r--r--calendar/gui/cal-search-bar.h6
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-folder-browser.c5
-rw-r--r--mail/em-format-html-display.c7
-rw-r--r--widgets/misc/ChangeLog10
-rw-r--r--widgets/misc/e-icon-entry.c26
-rw-r--r--widgets/misc/e-search-bar.c15
-rw-r--r--widgets/misc/e-search-bar.h3
10 files changed, 71 insertions, 14 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e894c375a3..254d0491d1 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-04 Johnny Jacob <jjohnny@novell.com>
+
+ * gui/cal-search-bar.h : Changed the CAL_SEARCH items mask for
+ tasks, memos, calendar.
+
2006-07-31 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #335276
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 12c6f1018e..437d09f62b 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -47,6 +47,7 @@ enum {
static ESearchBarItem search_option_items[] = {
{ N_("Summary contains"), SEARCH_SUMMARY_CONTAINS, ESB_ITEMTYPE_RADIO },
{ N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS, ESB_ITEMTYPE_RADIO },
+ { N_("Category is"), SEARCH_CATEGORY_IS, ESB_ITEMTYPE_RADIO },
{ N_("Comment contains"), SEARCH_COMMENT_CONTAINS, ESB_ITEMTYPE_RADIO },
{ N_("Location contains"), SEARCH_LOCATION_CONTAINS, ESB_ITEMTYPE_RADIO },
{ N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, ESB_ITEMTYPE_RADIO },
diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h
index 9a5f347841..dfb235a378 100644
--- a/calendar/gui/cal-search-bar.h
+++ b/calendar/gui/cal-search-bar.h
@@ -47,9 +47,9 @@ enum {
};
#define CAL_SEARCH_ALL (0xff)
-#define CAL_SEARCH_CALENDAR_DEFAULT (0x37)
-#define CAL_SEARCH_TASKS_DEFAULT (0x27)
-#define CAL_SEARCH_MEMOS_DEFAULT (0x25)
+#define CAL_SEARCH_CALENDAR_DEFAULT (0x33)
+#define CAL_SEARCH_TASKS_DEFAULT (0x23)
+#define CAL_SEARCH_MEMOS_DEFAULT (0x23)
typedef struct {
ESearchBar search_bar;
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;
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 2256055e89..d8df9e8ccd 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-04 Johnny Jacob <jjohnny@novell.com>
+
+ * e-icon-entry.c: (set_cursor) : Added. Change cursor over icon.
+ (e_icon_entry_create_button) : Handle enter/leave-notify signals
+ for changing cursor.
+ * e-search-bar.c: (e_search_bar_construct) : Added mnemonic for
+ "Sho_w". Added tooltips for e-icon-entry.
+ (option_activated_cb) : Set the selected item's label in tooltip.
+
+
2006-08-02 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #349565
diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c
index 3933132ec0..8b8e5affbb 100644
--- a/widgets/misc/e-icon-entry.c
+++ b/widgets/misc/e-icon-entry.c
@@ -37,10 +37,8 @@
#include "e-icon-entry.h"
#include <gtk/gtkentry.h>
-#include <gtk/gtkeventbox.h>
#include <gtk/gtkbox.h>
#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
#define E_ICON_ENTRY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), E_TYPE_ICON_ENTRY, EIconEntryPrivate))
@@ -118,7 +116,7 @@ e_icon_entry_paint (GtkWidget *widget,
NULL, entry_widget, "entry_bg",
/* FIXME: was 0, 0 in gtk_entry_expose, but I think this is correct: */
x, y, width, height);
-
+
gtk_paint_shadow (entry_widget->style, widget->window,
GTK_STATE_NORMAL, GTK_SHADOW_IN,
NULL, entry_widget, "entry",
@@ -334,6 +332,7 @@ e_icon_entry_pack_widget (EIconEntry *entry,
gboolean start)
{
EIconEntryPrivate *priv;
+ GtkWidget *box;
g_return_if_fail (E_IS_ICON_ENTRY (entry));
@@ -350,6 +349,18 @@ e_icon_entry_pack_widget (EIconEntry *entry,
}
}
+static void
+set_cursor (GtkWidget *widget, GdkEventCrossing *event, gpointer dummy)
+{
+
+ if (event->type == GDK_ENTER_NOTIFY)
+ gdk_window_set_cursor (widget->window, gdk_cursor_new (GDK_HAND1));
+ else
+ gdk_window_set_cursor (widget->window, gdk_cursor_new (GDK_LEFT_PTR));
+
+
+}
+
GtkWidget *
e_icon_entry_create_button (const char *stock)
{
@@ -357,11 +368,14 @@ e_icon_entry_create_button (const char *stock)
GtkWidget *image;
eventbox = gtk_event_box_new ();
- gtk_container_set_border_width (GTK_CONTAINER (eventbox), 2);
- gtk_event_box_set_visible_window ( (eventbox), FALSE);
+ gtk_container_set_border_width (GTK_CONTAINER (eventbox), 2);
+ gtk_event_box_set_visible_window ((eventbox), FALSE);
image = gtk_image_new_from_stock (stock, GTK_ICON_SIZE_MENU);
- gtk_container_add (GTK_CONTAINER (eventbox), image);
+ gtk_container_add (GTK_CONTAINER (eventbox), image);
+
+ g_signal_connect_after (eventbox, "enter-notify-event", set_cursor, NULL);
+ g_signal_connect_after (eventbox, "leave-notify-event", set_cursor, NULL);
return eventbox;
}
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 7202fa235f..7257c161d3 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -303,6 +303,7 @@ entry_focus_out_cb (GtkWidget *widget,
if (text && *text) {
gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_INSENSITIVE]));
gtk_entry_set_text (GTK_ENTRY (esb->entry), text);
+ gtk_tooltips_set_tip (esb->tooltips, esb->option_button, text, "Search type");
gtk_widget_hide (esb->clear_button);
}
}
@@ -430,6 +431,14 @@ option_activated_cb (GtkWidget *widget,
/* id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "EsbItemId")); */
/* esb->item_id = id; */
+ char *text;
+
+ if (GTK_IS_RADIO_MENU_ITEM (gtk_menu_get_active ( GTK_MENU (esb->option_menu)))) {
+ text = get_selected_item_label (esb->option_menu);
+ if (text && *text)
+ gtk_tooltips_set_tip (esb->tooltips, esb->option_button, text, "Search type");
+ }
+
emit_query_changed (esb);
emit_search_activated (esb);
}
@@ -842,6 +851,7 @@ init (ESearchBar *esb)
esb->scopeoption = NULL;
esb->scopeoption_box = NULL;
+ esb->tooltips = NULL;
esb->pending_activate = 0;
esb->item_id = 0;
@@ -875,6 +885,8 @@ e_search_bar_construct (ESearchBar *search_bar,
gtk_box_set_homogeneous (GTK_BOX (search_bar), FALSE);
+ search_bar->tooltips = gtk_tooltips_new ();
+
bighbox = gtk_hbox_new (FALSE, 0);
search_bar->entry_box = gtk_hbox_new (0, FALSE);
search_bar->icon_entry = e_icon_entry_new ();
@@ -907,11 +919,12 @@ e_search_bar_construct (ESearchBar *search_bar,
/* To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on... */
- label = gtk_label_new_with_mnemonic (_("Show: "));
+ label = gtk_label_new_with_mnemonic (_("Sho_w: "));
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX(search_bar->viewoption_box), label, FALSE, FALSE, 0);
search_bar->viewoption = gtk_option_menu_new ();
+ gtk_label_set_mnemonic_widget (label, search_bar->viewoption);
gtk_box_pack_start (GTK_BOX(search_bar->viewoption_box), search_bar->viewoption, FALSE, TRUE, 0);
gtk_widget_show_all (search_bar->viewoption_box);
gtk_box_pack_start (GTK_BOX(search_bar), search_bar->viewoption_box, FALSE, FALSE, 0);
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index b49cc7ecfb..3cb8af0d96 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -21,6 +21,7 @@
#define __E_SEARCH_BAR_H__
#include <gtk/gtkhbox.h>
+#include <gtk/gtktooltips.h>
#include <bonobo/bonobo-ui-component.h>
@@ -94,7 +95,7 @@ struct _ESearchBar
GtkWidget *scopeoption_menu;
guint pending_activate;
-
+ GtkTooltips *tooltips;
/* The currently-selected item & subitem */
int item_id;
int viewitem_id; /* Current View Id */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:18:30 +0800