Index: src/tracker-search-tool/tracker-search-tool.c =================================================================== --- src/tracker-search-tool/tracker-search-tool.c (revisione 655) +++ src/tracker-search-tool/tracker-search-tool.c (copia locale) @@ -968,11 +968,8 @@ GtkWidget * vbox; GtkWidget * hbox; GtkWidget * image; - GtkWidget * toolbar; - GtkIconSize toolbar_icon_size; - GtkWidget *toolitem; - GtkWidget *toolbutton2; - GtkWidget *toolbutton; + GtkWidget * button_prev; + GtkWidget * button_next; GtkWidget * window; GtkTreeViewColumn * column; @@ -983,49 +980,37 @@ hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); - toolbar = gtk_toolbar_new (); - gtk_widget_show (toolbar); - gtk_box_pack_start (GTK_BOX (hbox), toolbar, TRUE, TRUE, 0); - gtk_toolbar_set_orientation (GTK_TOOLBAR (toolbar), GTK_ORIENTATION_HORIZONTAL); - - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ); - toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar)); - - toolitem = (GtkWidget*) gtk_tool_item_new (); - gtk_widget_show (toolitem); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); - gtk_container_add (GTK_CONTAINER (toolbar), toolitem); - label = gtk_label_new (_("Search Results:")); - gtk_widget_show (label); + label = gtk_label_new (_("Search results: ")); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0); g_object_set (G_OBJECT (label), "xalign", 0.0, NULL); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_container_add (GTK_CONTAINER (toolitem), label); - toolitem = (GtkWidget*) gtk_tool_item_new (); - gtk_widget_show (toolitem); - gtk_container_add (GTK_CONTAINER (toolbar), toolitem); + /* Translators: this will appears as "Search results: no search performed" */ + gsearch->count_label = gtk_label_new (_("no search performed")); + gtk_box_pack_start (GTK_BOX (hbox), gsearch->count_label, FALSE, TRUE, 0); - gsearch->count_label = gtk_label_new (""); - gtk_widget_show (gsearch->count_label); - gtk_container_add (GTK_CONTAINER (toolitem), gsearch->count_label); + button_next = gtk_button_new(); + gtk_button_set_relief (GTK_BUTTON(button_next), GTK_RELIEF_NONE); + image = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_widget_set_tooltip_text (GTK_BUTTON(button_next), _("Add a meagniful tooltip here")); + /*FIXME: maybe add an a11y name for this button*/ + gtk_container_add (GTK_CONTAINER(button_next), image); + gtk_box_pack_end (GTK_BOX (hbox), button_next, FALSE, TRUE, 0); + button_prev = gtk_button_new(); + gtk_button_set_relief (GTK_BUTTON(button_prev), GTK_RELIEF_NONE); + image = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_widget_set_tooltip_text (GTK_BUTTON(button_prev), _("Add a meagniful tooltip here")); + /*FIXME: maybe add an a11y name for this button*/ + gtk_container_add (GTK_CONTAINER(button_prev), image); + gtk_box_pack_end (GTK_BOX (hbox), button_prev, FALSE, TRUE, 0); - image = gtk_image_new_from_stock ("gtk-go-back", toolbar_icon_size); - gtk_widget_show (image); - toolbutton2 = (GtkWidget*) gtk_tool_button_new (image, "Previous"); - gtk_widget_show (toolbutton2); - gtk_container_add (GTK_CONTAINER (toolbar), toolbutton2); - - gsearch->back_button = toolbutton2; + gsearch->back_button = button_prev; g_signal_connect (G_OBJECT (gsearch->back_button), "clicked", G_CALLBACK (prev_button_cb), (gpointer) gsearch); - image = gtk_image_new_from_stock ("gtk-go-forward", toolbar_icon_size); - gtk_widget_show (image); - toolbutton = (GtkWidget*) gtk_tool_button_new (image, "Next"); - gtk_widget_show (toolbutton); - gtk_container_add (GTK_CONTAINER (toolbar), toolbutton); - gsearch->forward_button = toolbutton; + + gsearch->forward_button = button_next; g_signal_connect (G_OBJECT (gsearch->forward_button), "clicked", G_CALLBACK (next_button_cb), (gpointer) gsearch); @@ -1041,7 +1026,7 @@ gtk_box_pack_start (GTK_BOX (hbox), gsearch->files_found_label, FALSE, FALSE, 0); window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (window), GTK_SHADOW_NONE); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (window), GTK_SHADOW_IN); gtk_container_set_border_width (GTK_CONTAINER (window), 0); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window), GTK_POLICY_AUTOMATIC, @@ -1189,11 +1174,6 @@ G_CALLBACK (columns_changed_cb), (gpointer) gsearch); - g_signal_connect (G_OBJECT (toolbar), - "size-allocate", - G_CALLBACK (toolbar_size_changed_cb), - (gpointer) gsearch); - return vbox; } @@ -1210,28 +1190,8 @@ GtkWidget *hbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); - gsearch->toolbar = gtk_toolbar_new (); - gtk_widget_show (gsearch->toolbar); - gtk_box_pack_start (GTK_BOX (hbox), gsearch->toolbar, TRUE, TRUE, 0); - gtk_toolbar_set_orientation (GTK_TOOLBAR (gsearch->toolbar), GTK_ORIENTATION_HORIZONTAL); - - gtk_toolbar_set_style (GTK_TOOLBAR (gsearch->toolbar), GTK_TOOLBAR_BOTH_HORIZ); - - - - GtkWidget *toolitem = (GtkWidget*) gtk_tool_item_new (); - gtk_widget_show (toolitem); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (toolitem), TRUE); - gtk_container_add (GTK_CONTAINER (gsearch->toolbar), toolitem); - GtkWidget *label = gtk_label_new (_("Categories:")); - gtk_widget_show (label); - g_object_set (G_OBJECT (label), "xalign", 0.0, NULL); - - gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); - gtk_container_add (GTK_CONTAINER (toolitem), label); - window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (window), GTK_SHADOW_NONE); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (window), GTK_SHADOW_IN); gtk_container_set_border_width (GTK_CONTAINER (window), 0); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (window), GTK_POLICY_AUTOMATIC, @@ -1240,7 +1200,6 @@ gsearch->category_list = gtk_tree_view_new (); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (gsearch->category_list), FALSE); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (gsearch->category_list), TRUE); if (gsearch->is_window_accessible) { @@ -1561,10 +1520,11 @@ } if (count > 5) { - /* Translators: this will appear like "Results 5 - 10 of 30" */ - label_str = g_strdup_printf (_("Results %d - %d of %d"), from, to, count); + /* Translators: this will appear like "Search results: 5 - 10 of 30 items" */ + label_str = g_strdup_printf (_("%d - %d of %d item"), from, to, count); } else - label_str = g_strdup_printf (ngettext ("%d result", "%d results", count), count); + /* Translators: this will appear like "Search results: 7 items" */ + label_str = g_strdup_printf (ngettext ("%d item", "%d items", count), count); gtk_label_set_text (GTK_LABEL (gsearch->count_label), label_str); g_free (label_str);