- GtkTooltips *tooltips;
-
- tooltips = lw->tooltips;
-
- box = gtk_hbox_new(FALSE, 0);
-
- lw->thumb_button = layout_button(box, (gchar **)icon_thumb_xpm, NULL, TRUE,
- tooltips, _("Show thumbnails"), G_CALLBACK(layout_button_thumb_cb), lw);
- layout_button(box, NULL, GTK_STOCK_HOME, FALSE,
- tooltips, _("Change to home folder"), G_CALLBACK(layout_button_home_cb), lw);
- layout_button(box, NULL, GTK_STOCK_REFRESH, FALSE,
- tooltips, _("Refresh file list"), G_CALLBACK(layout_button_refresh_cb), lw);
- layout_button(box, NULL, GTK_STOCK_ZOOM_IN, FALSE,
- tooltips, _("Zoom in"), G_CALLBACK(layout_button_zoom_in_cb), lw);
- layout_button(box, NULL, GTK_STOCK_ZOOM_OUT, FALSE,
- tooltips, _("Zoom out"), G_CALLBACK(layout_button_zoom_out_cb), lw);
- layout_button(box, NULL, GTK_STOCK_ZOOM_FIT, FALSE,
- tooltips, _("Fit image to window"), G_CALLBACK(layout_button_zoom_fit_cb), lw);
- layout_button(box, NULL, GTK_STOCK_ZOOM_100, FALSE,
- tooltips, _("Set zoom 1:1"), G_CALLBACK(layout_button_zoom_1_1_cb), lw);
- layout_button(box, NULL, GTK_STOCK_PREFERENCES, FALSE,
- tooltips, _("Configure options"), G_CALLBACK(layout_button_config_cb), lw);
- layout_button(box, (gchar **)icon_float_xpm, NULL, FALSE,
- tooltips, _("Float Controls"), G_CALLBACK(layout_button_float_cb), lw);
+ GtkWidget *button;
+
+ box = pref_toolbar_new(NULL, GTK_TOOLBAR_ICONS);
+
+ button = pref_toolbar_button(box, NULL, _("_Thumbnails"), TRUE,
+ _("Show thumbnails"), G_CALLBACK(layout_button_thumb_cb), lw);
+ layout_button_custom_icon(button, PIXBUF_INLINE_ICON_THUMB);
+ lw->thumb_button = button;
+
+ pref_toolbar_button(box, GTK_STOCK_HOME, NULL, FALSE,
+ _("Change to home folder"), G_CALLBACK(layout_button_home_cb), lw);
+ pref_toolbar_button(box, GTK_STOCK_REFRESH, NULL, FALSE,
+ _("Refresh file list"), G_CALLBACK(layout_button_refresh_cb), lw);
+ pref_toolbar_button(box, GTK_STOCK_ZOOM_IN, NULL, FALSE,
+ _("Zoom in"), G_CALLBACK(layout_button_zoom_in_cb), lw);
+ pref_toolbar_button(box, GTK_STOCK_ZOOM_OUT, NULL, FALSE,
+ _("Zoom out"), G_CALLBACK(layout_button_zoom_out_cb), lw);
+ pref_toolbar_button(box, GTK_STOCK_ZOOM_FIT, NULL, FALSE,
+ _("Fit image to window"), G_CALLBACK(layout_button_zoom_fit_cb), lw);
+ pref_toolbar_button(box, GTK_STOCK_ZOOM_100, NULL, FALSE,
+ _("Set zoom 1:1"), G_CALLBACK(layout_button_zoom_1_1_cb), lw);
+ pref_toolbar_button(box, GTK_STOCK_PREFERENCES, NULL, FALSE,
+ _("Configure options"), G_CALLBACK(layout_button_config_cb), lw);
+ button = pref_toolbar_button(box, NULL, _("_Float"), FALSE,
+ _("Float Controls"), G_CALLBACK(layout_button_float_cb), lw);
+ layout_button_custom_icon(button, PIXBUF_INLINE_ICON_FLOAT);