-
- priv->previous_button = gtk_button_new_with_mnemonic (_("_Previous"));
- priv->next_button = gtk_button_new_with_mnemonic (_("_Next"));
-
- image_back = gtk_image_new_from_stock (GTK_STOCK_GO_BACK,
- GTK_ICON_SIZE_BUTTON);
- image_forward = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD,
- GTK_ICON_SIZE_BUTTON);
-
- gtk_button_set_image (GTK_BUTTON (priv->previous_button),
- image_back);
- gtk_button_set_image (GTK_BUTTON (priv->next_button),
- image_forward);
-
- priv->case_button = gtk_check_button_new_with_mnemonic (_("C_ase Sensitive"));
-
-#if 0
- {
- GtkWidget *button_label;
- /* This hack doesn't work because GtkCheckButton doesn't pass the
- * larger size allocation to the label, it always gives the label
- * its exact request. If you un-ifdef this, set the box back
- * on case_button to TRUE, TRUE below
- */
- button_label = gtk_bin_get_child (GTK_BIN (priv->case_button));
- gtk_label_set_ellipsize (GTK_LABEL (button_label),
- PANGO_ELLIPSIZE_END);
- }
-#endif
-
- gtk_box_pack_start (GTK_BOX (priv->hbox),
- priv->close_button, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (priv->hbox),
- label, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (priv->hbox),
- priv->find_entry, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (priv->hbox),
- priv->previous_button, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (priv->hbox),
- priv->next_button, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (priv->hbox),
- separator, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (priv->hbox),
- priv->case_button, FALSE, FALSE, 0);
-
- gtk_container_add (GTK_CONTAINER (find_bar), priv->hbox);
-
- gtk_widget_show (priv->hbox);
- gtk_widget_show (priv->close_button);
- gtk_widget_show (priv->find_entry);
- gtk_widget_show (priv->previous_button);
- gtk_widget_show (priv->next_button);
- gtk_widget_show (separator);
- gtk_widget_show (label);
- gtk_widget_show (image);
- gtk_widget_show (image_back);
- gtk_widget_show (image_forward);
-
- gtk_widget_pop_composite_child ();
-
- gtk_widget_show_all (priv->hbox);
-
- g_signal_connect (priv->close_button, "clicked",
- G_CALLBACK (close_clicked_callback),
- find_bar);
+
+ /* Prev */
+ arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE);
+ priv->previous_button = gtk_tool_button_new (arrow, Q_("Find Pre_vious"));
+ gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (priv->previous_button), TRUE);
+ gtk_tool_item_set_is_important (priv->previous_button, TRUE);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (priv->previous_button),
+ _("Find previous occurrence of the search string"));
+
+ /* Next */
+ arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
+ priv->next_button = gtk_tool_button_new (arrow, Q_("Find Ne_xt"));
+ gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (priv->next_button), TRUE);
+ gtk_tool_item_set_is_important (priv->next_button, TRUE);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (priv->next_button),
+ _("Find next occurrence of the search string"));
+
+ /* Separator*/
+ priv->status_separator = gtk_separator_tool_item_new();
+
+ /* Case button */
+ priv->case_button = gtk_toggle_tool_button_new ();
+ g_object_set (G_OBJECT (priv->case_button), "label", _("C_ase Sensitive"), NULL);
+ gtk_tool_item_set_is_important (priv->case_button, TRUE);
+ gtk_widget_set_tooltip_text (GTK_WIDGET (priv->case_button),
+ _("Toggle case sensitive search"));
+
+ /* Status */
+ priv->status_item = gtk_tool_item_new();
+ gtk_tool_item_set_expand (priv->status_item, TRUE);
+ priv->status_label = gtk_label_new (NULL);
+ gtk_label_set_ellipsize (GTK_LABEL (priv->status_label),
+ PANGO_ELLIPSIZE_END);
+ gtk_misc_set_alignment (GTK_MISC (priv->status_label), 0.0, 0.5);
+
+