src/toolbar.c

   1 /*
   2  * Copyright (C) 2004 John Ellis
   3  * Copyright (C) 2008 - 2017 The Geeqie Team
   4  *
   5  * Author: Colin Clark
   6  *
   7  * This program is free software; you can redistribute it and/or modify
   8  * it under the terms of the GNU General Public License as published by
   9  * the Free Software Foundation; either version 2 of the License, or
  10  * (at your option) any later version.
  11  *
  12  * This program is distributed in the hope that it will be useful,
  13  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  14  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  15  * GNU General Public License for more details.
  16  *
  17  * You should have received a copy of the GNU General Public License along
  18  * with this program; if not, write to the Free Software Foundation, Inc.,
  19  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  20  */
  21
  22 #include "main.h"
  23 #include "toolbar.h"
  24
  25 #include "collect.h"
  26 #include "layout_util.h"
  27 #include "ui_fileops.h"
  28 #include "ui_misc.h"
  29 #include "pixbuf_util.h"
  30 #include "ui_menu.h"
  31 #include "editors.h"
  32
  33 /** Implements the user-definable toolbar function
  34  * Called from the Preferences/toolbar tab
  35  **/
  36
  37 typedef struct _ToolbarData ToolbarData;
  38 struct _ToolbarData
  39 {
  40         GtkWidget *widget;
  41         GtkWidget *vbox;
  42         GtkWidget *add_button;
  43
  44         LayoutWindow *lw;
  45 };
  46
  47 typedef struct _ToolbarButtonData ToolbarButtonData;
  48 struct _ToolbarButtonData
  49 {
  50         GtkWidget *button;
  51         GtkWidget *button_label;
  52         GtkWidget *image;
  53
  54         gchar *name; /* GtkActionEntry terminology */
  55         gchar *stock_id;
  56 };
  57
  58 static  ToolbarData *toolbarlist;
  59
  60 typedef struct _UseableToolbarItems UseableToolbarItems;
  61 struct _UseableToolbarItems
  62 {
  63         gchar *name; /* GtkActionEntry terminology */
  64         gchar *label;
  65         gchar *stock_id;
  66 };
  67
  68 /* FIXME Should be created by program from menu_entries[]
  69  * in layout_util.c */
  70  /** The user is limited to selecting from this list of menu items
  71   * plus any desktop files
  72   **/
  73 static const UseableToolbarItems useable_toolbar_items[] = {
  74         {"FirstImage",  N_("First Image"), GTK_STOCK_GOTO_TOP},
  75         {"PrevImage",   N_("Previous Image"), GTK_STOCK_GO_UP},
  76         {"NextImage",   N_("Next Image"), GTK_STOCK_GO_DOWN},
  77         {"LastImage",   N_("Last Image"), GTK_STOCK_GOTO_BOTTOM},
  78         {"Back",        N_("Back"), GTK_STOCK_GO_BACK},
  79         {"Forward",     N_("Forward"), GTK_STOCK_GO_FORWARD},
  80         {"Home",        N_("Home"), GTK_STOCK_HOME},
  81         {"Up",  N_("Up"), GTK_STOCK_GO_UP},
  82         {"NewWindow",   N_("New _window"), GTK_STOCK_NEW},
  83         {"NewCollection",       N_("New collection"), GTK_STOCK_INDEX},
  84         {"OpenCollection",      N_("Open collection"), GTK_STOCK_OPEN},
  85         {"Search",      N_("Search"), GTK_STOCK_FIND},
  86         {"FindDupes",   N_("Find duplicates"), GTK_STOCK_FIND},
  87         {"NewFolder",   N_("New folder"),GTK_STOCK_DIRECTORY},
  88         {"Copy",        N_("Copy"), GTK_STOCK_COPY},
  89         {"Move",        N_("Move"), PIXBUF_INLINE_ICON_MOVE},
  90         {"Rename",      N_("Rename"), PIXBUF_INLINE_ICON_RENAME},
  91         {"Delete",      N_("Delete"), GTK_STOCK_DELETE},
  92         {"CloseWindow", N_("Close Window"), GTK_STOCK_CLOSE},
  93         {"PanView",     N_("Pan view"), PIXBUF_INLINE_ICON_PANORAMA},
  94         {"SelectAll",   N_("Select all"), PIXBUF_INLINE_ICON_SELECT_ALL},
  95         {"SelectNone",  N_("Select none"), PIXBUF_INLINE_ICON_SELECT_NONE},
  96         {"SelectInvert",        N_("Select invert"), PIXBUF_INLINE_ICON_SELECT_INVERT},
  97         {"ShowFileFilter",      N_("Show file filter"), PIXBUF_INLINE_ICON_FILE_FILTER},
  98         {"RectangularSelection",        N_("Select rectangle"), PIXBUF_INLINE_ICON_SELECT_RECTANGLE},
  99         {"Print",       N_("Print"), GTK_STOCK_PRINT},
 100         {"Preferences", N_("Preferences"), GTK_STOCK_PREFERENCES},
 101         {"LayoutConfig",        N_("Configure this window"), GTK_STOCK_PREFERENCES},
 102         {"Maintenance", N_("Cache maintenance"), PIXBUF_INLINE_ICON_MAINTENANCE},
 103         {"RotateCW",    N_("Rotate clockwise"), PIXBUF_INLINE_ICON_CW},
 104         {"RotateCCW",   N_("Rotate counterclockwise"), PIXBUF_INLINE_ICON_CCW},
 105         {"Rotate180",   N_("Rotate 180"), PIXBUF_INLINE_ICON_180},
 106         {"Mirror",      N_("Mirror"), PIXBUF_INLINE_ICON_MIRROR},
 107         {"Flip",        N_("Flip"), PIXBUF_INLINE_ICON_FLIP},
 108         {"AlterNone",   N_("Original state"), PIXBUF_INLINE_ICON_ORIGINAL},
 109         {"ZoomIn",      N_("Zoom in"), GTK_STOCK_ZOOM_IN},
 110         {"ZoomOut",     N_("Zoom out"), GTK_STOCK_ZOOM_OUT},
 111         {"Zoom100",     N_("Zoom 1:1"), GTK_STOCK_ZOOM_100},
 112         {"ZoomFit",     N_("Zoom to fit"), GTK_STOCK_ZOOM_FIT},
 113         {"ZoomFillHor", N_("Fit Horizontaly"), PIXBUF_INLINE_ICON_ZOOMFILLHOR},
 114         {"ZoomFillVert",        N_("Fit vertically"), PIXBUF_INLINE_ICON_ZOOMFILLVERT},
 115         {"Zoom200",     N_("Zoom 2:1"), GTK_STOCK_FILE},
 116         {"Zoom300",     N_("Zoom 3:1"), GTK_STOCK_FILE},
 117         {"Zoom400",     N_("Zoom 4:1"), GTK_STOCK_FILE},
 118         {"Zoom50",      N_("Zoom 1:2"), GTK_STOCK_FILE},
 119         {"Zoom33",      N_("Zoom1:3"), GTK_STOCK_FILE},
 120         {"Zoom25",      N_("Zoom 1:4"), GTK_STOCK_FILE},
 121         {"ConnectZoomIn",       N_("Connected Zoom in"), GTK_STOCK_ZOOM_IN},
 122         {"HideTools",   N_("Hide file list"), PIXBUF_INLINE_ICON_HIDETOOLS},
 123         {"SlideShowPause",      N_("Pause slideshow"), GTK_STOCK_MEDIA_PAUSE},
 124         {"SlideShowFaster",     N_("Slideshow Faster"), GTK_STOCK_FILE},
 125         {"SlideShowSlower",     N_("Slideshow Slower"), GTK_STOCK_FILE},
 126         {"Refresh",     N_("Refresh"), GTK_STOCK_REFRESH},
 127         {"HelpContents",        N_("Help"), GTK_STOCK_HELP},
 128         {"ExifWin",     N_("Exif window"), PIXBUF_INLINE_ICON_EXIF},
 129         {"Thumbnails",  N_("Show thumbnails"), PIXBUF_INLINE_ICON_THUMB},
 130         {"ShowMarks",   N_("Show marks"), PIXBUF_INLINE_ICON_MARKS},
 131         {"ImageGuidelines",     N_("Show guidelines"), PIXBUF_INLINE_ICON_GUIDELINES},
 132         {"DrawRectangle",       N_("Draw Rectangle"), PIXBUF_INLINE_ICON_DRAW_RECTANGLE},
 133         {"FloatTools",  N_("Float file list"), PIXBUF_INLINE_ICON_FLOAT},
 134         {"SBar",        N_("Info sidebar"), PIXBUF_INLINE_ICON_INFO},
 135         {"SBarSort",    N_("Sort manager"), PIXBUF_INLINE_ICON_SORT},
 136         {"Quit",        N_("Quit"), GTK_STOCK_QUIT},
 137         {NULL,          NULL, NULL}
 138 };
 139
 140 /**
 141  * @brief
 142  * @param widget Not used
 143  * @param data Pointer to vbox list item
 144  * @param up Up/Down movement
 145  * @param single_step Move up/down one step, or to top/bottom
 146  *
 147  */
 148 static void toolbar_item_move(GtkWidget *widget, gpointer data,
 149                                                                         gboolean up, gboolean single_step)
 150 {
 151         GtkWidget *list_item = data;
 152         GtkWidget *box;
 153         gint pos = 0;
 154
 155         if (!list_item) return;
 156         box = gtk_widget_get_ancestor(list_item, GTK_TYPE_BOX);
 157         if (!box) return;
 158
 159         gtk_container_child_get(GTK_CONTAINER(box), list_item, "position", &pos, NULL);
 160
 161         if (single_step)
 162                 {
 163                 pos = up ? (pos - 1) : (pos + 1);
 164                 if (pos < 0) pos = 0;
 165                 }
 166         else
 167                 {
 168                 pos = up ? 0 : -1;
 169                 }
 170
 171         gtk_box_reorder_child(GTK_BOX(box), list_item, pos);
 172 }
 173
 174 static void toolbar_item_move_up_cb(GtkWidget *widget, gpointer data)
 175 {
 176         toolbar_item_move(widget, data, TRUE, TRUE);
 177 }
 178
 179 static void toolbar_item_move_down_cb(GtkWidget *widget, gpointer data)
 180 {
 181         toolbar_item_move(widget, data, FALSE, TRUE);
 182 }
 183
 184 static void toolbar_item_move_top_cb(GtkWidget *widget, gpointer data)
 185 {
 186         toolbar_item_move(widget, data, TRUE, FALSE);
 187 }
 188
 189 static void toolbar_item_move_bottom_cb(GtkWidget *widget, gpointer data)
 190 {
 191         toolbar_item_move(widget, data, FALSE, FALSE);
 192 }
 193
 194 static void toolbar_item_delete_cb(GtkWidget *widget, gpointer data)
 195 {
 196         gtk_widget_destroy(data);
 197 }
 198
 199 static void toolbar_menu_popup(GtkWidget *widget)
 200 {
 201         GtkWidget *menu;
 202         GtkWidget *vbox;
 203
 204         vbox = gtk_widget_get_parent(widget);
 205
 206         menu = popup_menu_short_lived();
 207
 208         if (widget)
 209                 {
 210                 menu_item_add_stock(menu, _("Move to _top"), GTK_STOCK_GOTO_TOP, G_CALLBACK(toolbar_item_move_top_cb), widget);
 211                 menu_item_add_stock(menu, _("Move _up"), GTK_STOCK_GO_UP, G_CALLBACK(toolbar_item_move_up_cb), widget);
 212                 menu_item_add_stock(menu, _("Move _down"), GTK_STOCK_GO_DOWN, G_CALLBACK(toolbar_item_move_down_cb), widget);
 213                 menu_item_add_stock(menu, _("Move to _bottom"), GTK_STOCK_GOTO_BOTTOM, G_CALLBACK(toolbar_item_move_bottom_cb), widget);
 214                 menu_item_add_divider(menu);
 215                 menu_item_add_stock(menu, _("Remove"), GTK_STOCK_DELETE, G_CALLBACK(toolbar_item_delete_cb), widget);
 216                 menu_item_add_divider(menu);
 217                 }
 218
 219         gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, vbox, 0, GDK_CURRENT_TIME);
 220 }
 221
 222 static gboolean toolbar_press_cb(GtkWidget *button, GdkEventButton *event, gpointer data)
 223 {
 224         ToolbarButtonData *button_data = data;
 225
 226         if (event->button == MOUSE_BUTTON_RIGHT)
 227                 {
 228                 toolbar_menu_popup(button_data->button);
 229                 return TRUE;
 230                 }
 231         return FALSE;
 232 }
 233
 234 static void get_toolbar_item(const gchar *name, gchar **label, gchar **stock_id)
 235 {
 236         const UseableToolbarItems *list = useable_toolbar_items;
 237         *label = NULL;
 238         *stock_id = NULL;
 239
 240         while (list->name)
 241                 {
 242                 if (g_strcmp0(list->name, name) == 0)
 243                         {
 244                         *label = g_strdup(list->label);
 245                         *stock_id = g_strdup(list->stock_id);
 246                         break;
 247                         }
 248                 list++;
 249                 }
 250 }
 251
 252
 253 static void toolbar_item_free(ToolbarButtonData *tbbd)
 254 {
 255         if (!tbbd) return;
 256
 257         g_free(tbbd->name);
 258         g_free(tbbd->stock_id);
 259         g_free(tbbd);
 260 }
 261
 262 static void toolbar_button_free(GtkWidget *widget)
 263 {
 264         g_free(g_object_get_data(G_OBJECT(widget), "toolbar_add_name"));
 265         g_free(g_object_get_data(G_OBJECT(widget), "toolbar_add_label"));
 266         g_free(g_object_get_data(G_OBJECT(widget), "toolbar_add_stock_id"));
 267 }
 268
 269 static void toolbarlist_add_button(const gchar *name, const gchar *label,
 270                                                                         const gchar *stock_id, GtkBox *box)
 271 {
 272         ToolbarButtonData *toolbar_entry;
 273         GtkWidget *hbox;
 274
 275         toolbar_entry = g_new(ToolbarButtonData,1);
 276         toolbar_entry->button = gtk_button_new();
 277         gtk_button_set_relief(GTK_BUTTON(toolbar_entry->button), GTK_RELIEF_NONE);
 278         gtk_box_pack_start(GTK_BOX(box), toolbar_entry->button, FALSE, FALSE, 0);
 279         gtk_widget_show(toolbar_entry->button);
 280
 281         g_object_set_data_full(G_OBJECT(toolbar_entry->button), "toolbarbuttondata",
 282         toolbar_entry, (GDestroyNotify)toolbar_item_free);
 283
 284         hbox = gtk_hbox_new(FALSE, PREF_PAD_BUTTON_GAP);
 285         gtk_container_add(GTK_CONTAINER(toolbar_entry->button), hbox);
 286         gtk_widget_show(hbox);
 287
 288         toolbar_entry->button_label = gtk_label_new(label);
 289         toolbar_entry->name = g_strdup(name);
 290         toolbar_entry->stock_id = g_strdup(stock_id);
 291         g_signal_connect(G_OBJECT(toolbar_entry->button), "button_release_event",
 292                                                                         G_CALLBACK(toolbar_press_cb), toolbar_entry);
 293
 294         if (toolbar_entry->stock_id)
 295                 {
 296                 GdkPixbuf *pixbuf;
 297                 gchar *iconl;
 298                 iconl = path_from_utf8(toolbar_entry->stock_id);
 299                 pixbuf = gdk_pixbuf_new_from_file(iconl, NULL);
 300                 g_free(iconl);
 301                 if (pixbuf)
 302                         {
 303                         GdkPixbuf *scaled;
 304                         gint w, h;
 305
 306                         w = h = 16;
 307                         gtk_icon_size_lookup(GTK_ICON_SIZE_BUTTON, &w, &h);
 308
 309                         scaled = gdk_pixbuf_scale_simple(pixbuf, w, h,
 310                                                          GDK_INTERP_BILINEAR);
 311                         toolbar_entry->image = gtk_image_new_from_pixbuf(scaled);
 312
 313                         g_object_unref(scaled);
 314                         g_object_unref(pixbuf);
 315                         }
 316                 else
 317                         {
 318                         toolbar_entry->image = gtk_image_new_from_stock(toolbar_entry->stock_id,
 319                                                                                                                 GTK_ICON_SIZE_BUTTON);
 320                         }
 321                 }
 322         else
 323                 {
 324                 toolbar_entry->image = gtk_image_new_from_stock(GTK_STOCK_JUMP_TO,
 325                                                                                                                 GTK_ICON_SIZE_BUTTON);
 326                 }
 327         gtk_box_pack_start(GTK_BOX(hbox), toolbar_entry->image, FALSE, FALSE, 0);
 328         gtk_widget_show(toolbar_entry->image);
 329         gtk_box_pack_start(GTK_BOX(hbox), toolbar_entry->button_label, FALSE, FALSE, 0);
 330         gtk_widget_show(toolbar_entry->button_label);
 331 }
 332
 333 static void toolbarlist_add_cb(GtkWidget *widget, gpointer data)
 334 {
 335         const gchar *name = g_object_get_data(G_OBJECT(widget), "toolbar_add_name");
 336         const gchar *label = g_object_get_data(G_OBJECT(widget), "toolbar_add_label");
 337         const gchar *stock_id = g_object_get_data(G_OBJECT(widget), "toolbar_add_stock_id");
 338         ToolbarData *tbbd = data;
 339
 340         toolbarlist_add_button(name, label, stock_id, GTK_BOX(tbbd->vbox));
 341 }
 342
 343 static void get_desktop_data(const gchar *name, gchar **label, gchar **stock_id)
 344 {
 345         GList *editors_list;
 346         GList *work;
 347         *label = NULL;
 348         *stock_id = NULL;
 349
 350         editors_list = editor_list_get();
 351         work = editors_list;
 352         while (work)
 353                 {
 354                 const EditorDescription *editor = work->data;
 355
 356                 if (g_strcmp0(name, editor->key) == 0)
 357                         {
 358                         *label = g_strdup(editor->name);
 359                         *stock_id = g_strconcat(editor->icon, ".desktop", NULL);
 360                         break;
 361                         }
 362                 work = work->next;
 363                 }
 364         g_list_free(editors_list);
 365 }
 366
 367 static void toolbar_menu_add_popup(GtkWidget *widget, gpointer data)
 368 {
 369         GtkWidget *menu;
 370         GList *editors_list;
 371         GList *work;
 372         ToolbarData *toolbarlist = data;
 373         const UseableToolbarItems *list = useable_toolbar_items;
 374
 375         menu = popup_menu_short_lived();
 376
 377         /* get standard menu item data */
 378         while (list->name)
 379                 {
 380                 GtkWidget *item;
 381                 item = menu_item_add_stock(menu, list->label, list->stock_id,
 382                                                                                 G_CALLBACK(toolbarlist_add_cb), toolbarlist);
 383                 g_object_set_data(G_OBJECT(item), "toolbar_add_name", g_strdup(list->name));
 384                 g_object_set_data(G_OBJECT(item), "toolbar_add_label", g_strdup(list->label));
 385                 g_object_set_data(G_OBJECT(item), "toolbar_add_stock_id", g_strdup(list->stock_id));
 386                 g_signal_connect(G_OBJECT(item), "destroy", G_CALLBACK(toolbar_button_free), item);
 387                 list++;
 388                 }
 389
 390         /* get desktop file data */
 391         editors_list = editor_list_get();
 392         work = editors_list;
 393         while (work)
 394                 {
 395                 const EditorDescription *editor = work->data;
 396
 397                 GtkWidget *item;
 398                 gchar *icon = g_strconcat(editor->icon, ".desktop", NULL);
 399
 400                 item = menu_item_add_stock(menu, editor->name, icon,
 401                                                                                 G_CALLBACK(toolbarlist_add_cb), toolbarlist);
 402                 g_object_set_data(G_OBJECT(item), "toolbar_add_name", g_strdup(editor->key));
 403                 g_object_set_data(G_OBJECT(item), "toolbar_add_label", g_strdup(editor->name));
 404                 g_object_set_data(G_OBJECT(item), "toolbar_add_stock_id", icon);
 405                 g_signal_connect(G_OBJECT(item), "destroy", G_CALLBACK(toolbar_button_free), item);
 406                 work = work->next;
 407                 }
 408         g_list_free(editors_list);
 409
 410         gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, widget, 0, GDK_CURRENT_TIME);
 411 }
 412
 413 static gboolean toolbar_menu_add_cb(GtkWidget *widget, gpointer data)
 414 {
 415         ToolbarData *toolbarlist = data;
 416
 417         toolbar_menu_add_popup(widget, toolbarlist);
 418         return TRUE;
 419 }
 420
 421 /**
 422  * @brief For each layoutwindow, clear toolbar and reload with current selection
 423  *
 424  */
 425 void toolbar_apply()
 426 {
 427         LayoutWindow *lw;
 428         GList *work_windows;
 429         GList *work_toolbar;
 430
 431         work_windows = layout_window_list;
 432         while (work_windows)
 433                 {
 434                 lw = work_windows->data;
 435
 436                 layout_toolbar_clear(lw, TOOLBAR_MAIN);
 437
 438                 work_toolbar = gtk_container_get_children(GTK_CONTAINER(toolbarlist->vbox));
 439                 while (work_toolbar)
 440                         {
 441                         GtkButton *button = work_toolbar->data;
 442                         ToolbarButtonData *tbbd;
 443
 444                         tbbd = g_object_get_data(G_OBJECT(button),"toolbarbuttondata");
 445                         layout_toolbar_add(lw, TOOLBAR_MAIN, tbbd->name);
 446
 447                         work_toolbar = work_toolbar->next;
 448                         }
 449                 g_list_free(work_toolbar);
 450
 451                 work_windows = work_windows->next;
 452                 }
 453
 454 }
 455
 456 /**
 457  * @brief Load the current toolbar items into the vbox
 458  * @param lw
 459  * @param box The vbox displayed in the preferences Toolbar tab
 460  *
 461  * Get the current contents of the toolbar, both menu items
 462  * and desktop items, and load them into the vbox
 463  */
 464 static void toolbarlist_populate(LayoutWindow *lw, GtkBox *box)
 465 {
 466         GList *work = g_list_first(lw->toolbar_actions[TOOLBAR_MAIN]);
 467
 468         while (work)
 469                 {
 470                 gchar *name = work->data;
 471                 gchar *label;
 472                 gchar *icon;
 473                 work = work->next;
 474
 475                 if (file_extension_match(name, ".desktop"))
 476                         {
 477                         get_desktop_data(name, &label, &icon);
 478                         }
 479                 else
 480                         {
 481                         get_toolbar_item(name, &label, &icon);
 482                         }
 483                 toolbarlist_add_button(name, label, icon, box);
 484                 }
 485 }
 486
 487 GtkWidget *toolbar_select_new(LayoutWindow *lw)
 488 {
 489         GtkWidget *scrolled;
 490         GtkWidget *tbar;
 491         GtkWidget *add_box;
 492
 493         if (!lw) return NULL;
 494
 495         if (!toolbarlist)
 496                 {
 497                 toolbarlist = g_new0(ToolbarData, 1);
 498                 }
 499         toolbarlist->lw = lw;
 500
 501         toolbarlist->widget = gtk_vbox_new(FALSE, PREF_PAD_GAP);
 502         gtk_widget_show(toolbarlist->widget);
 503
 504         scrolled = gtk_scrolled_window_new(NULL, NULL);
 505         gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
 506                                                         GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 507         gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_NONE);
 508         gtk_box_pack_start(GTK_BOX(toolbarlist->widget), scrolled, TRUE, TRUE, 0);
 509         gtk_widget_show(scrolled);
 510
 511         toolbarlist->vbox = gtk_vbox_new(FALSE, 0);
 512         gtk_widget_show(toolbarlist->vbox);
 513         gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), toolbarlist->vbox);
 514         gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(scrolled))),
 515                                                                                                                                 GTK_SHADOW_NONE);
 516
 517         add_box = gtk_vbox_new(FALSE, 0);
 518         gtk_widget_show(add_box);
 519         gtk_box_pack_end(GTK_BOX(toolbarlist->widget), add_box, FALSE, FALSE, 0);
 520         tbar = pref_toolbar_new(add_box, GTK_TOOLBAR_ICONS);
 521         toolbarlist->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, "NULL", FALSE,
 522                                                                                         _("Add Toolbar Item"),
 523                                                                                         G_CALLBACK(toolbar_menu_add_cb), toolbarlist);
 524         gtk_widget_show(toolbarlist->add_button);
 525
 526         toolbarlist_populate(lw,GTK_BOX(toolbarlist->vbox));
 527
 528         return toolbarlist->widget;
 529 }
 530
 531 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */