diff options
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/ChangeLog | 18 | ||||
| -rw-r--r-- | widgets/misc/e-filter-bar.c | 19 | ||||
| -rw-r--r-- | widgets/misc/e-search-bar.c | 22 |
3 files changed, 46 insertions, 13 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index 53ede2ff84..f80719b0cc 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,21 @@ +2001-05-08 Gediminas Paulauskas <menesis@delfi.lt> + + * misc/e-search-bar.c (add_dropdown), (set_option): first try to + translate, then if not suceeded -- convert from utf8. This handles + cases when menuitem needs to be translated (it is passed as N_()), or is + utf8 search title. However you cannot have a search like "Folders" -- it + is translated. Part of fix for #2253. + + * misc/e-filter-bar.c: d() debugging strings. Use E_FILTERBAR_ADVANCED + macro instead of own "Advanced ..." for consistency. + +2001-05-07 Gediminas Paulauskas <menesis@delfi.lt> + + * menus/gal-view-menus.c (build_menus): convert label to locale + encoding. Still displays truncated strings. + + * menus/Makefile.am: removed -DEVOLUTION_VERSION. + 2001-04-21 Gediminas Paulauskas <menesis@delfi.lt> * menus/gal-view-menus.c: bonobo_ui_node_set_attr expects unstranslated diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index 24bbba4d57..2a84912d62 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -37,6 +37,8 @@ #include <gal/widgets/e-unicode.h> #include <gal/widgets/e-gui-utils.h> +#define d(x) + enum { LAST_SIGNAL @@ -137,7 +139,7 @@ menubar_activated (ESearchBar *esb, int id, void *data) switch(id) { case E_FILTERBAR_RESET_ID: - printf("Reset menu\n"); + d(printf("Reset menu\n")); efb->current_query = NULL; gtk_object_set((GtkObject *)esb, "option_choice", efb->option_base, NULL); gtk_object_set((GtkObject *)esb, "text", NULL, NULL); @@ -185,14 +187,14 @@ menubar_activated (ESearchBar *esb, int id, void *data) gtk_widget_show((GtkWidget *)gd); } - printf("Save menu\n"); + d(printf("Save menu\n")); break; default: if (id >= efb->menu_base && id < efb->menu_base + efb->menu_rules->len) { GString *out = g_string_new(""); - printf("Selected rule: %s\n", ((FilterRule *)efb->menu_rules->pdata[id - efb->menu_base])->name); + d(printf("Selected rule: %s\n", ((FilterRule *)efb->menu_rules->pdata[id - efb->menu_base])->name)); filter_rule_build_code(efb->menu_rules->pdata[id - efb->menu_base], out); - printf("query: '%s'\n", out->str); + d(printf("query: '%s'\n", out->str)); g_string_free(out, 1); efb->current_query = (FilterRule *)efb->menu_rules->pdata[id - efb->menu_base]; @@ -216,11 +218,11 @@ option_changed (ESearchBar *esb, void *data) int id = esb->option_choice; char *query; - printf("option changed, id = %d\n", id); + d(printf("option changed, id = %d\n", id)); switch(id) { case E_FILTERBAR_ADVANCED_ID: { - printf("Advanced search!\n"); + d(printf("Advanced search!\n")); if (!efb->save_dialogue && !efb->setquery) { GtkWidget *w; @@ -313,9 +315,8 @@ static GArray *build_items(ESearchBar *esb, ESearchBarItem *items, int type, int /* always add on the advanced menu */ if (type == 1) { - item.id = E_FILTERBAR_ADVANCED_ID; - item.text = _("Advanced ..."); - g_array_append_vals(menu, &item, 1); + ESearchBarItem advanced_item = E_FILTERBAR_ADVANCED; + g_array_append_vals(menu, &advanced_item, 1); } item.id = -1; diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 3be08f4063..c668082260 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -118,8 +118,15 @@ static void add_dropdown(ESearchBar *esb, ESearchBarItem *items) GtkWidget *menu = esb->dropdown_menu; GtkWidget *item; - if (items->text) - item = gtk_menu_item_new_with_label (_(items->text)); + if (items->text) { + char *str; + str = _(items->text); + if (str == items->text) { + /* It may be english string, or utf8 rule name */ + item = e_utf8_gtk_menu_item_new_with_label (menu, str); + } else + item = gtk_menu_item_new_with_label (str); + } else item = gtk_menu_item_new(); @@ -189,8 +196,15 @@ set_option(ESearchBar *esb, ESearchBarItem *items) for (i = 0; items[i].id != -1; i++) { GtkWidget *item; - if (items[i].text) - item = gtk_menu_item_new_with_label (_(items[i].text)); + if (items[i].text) { + char *str; + str = _(items[i].text); + if (str == items[i].text) { + /* It may be english string, or utf8 rule name */ + item = e_utf8_gtk_menu_item_new_with_label (menu, str); + } else + item = gtk_menu_item_new_with_label (str); + } else item = gtk_menu_item_new(); |