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         {"Grayscale",   N_("Grayscale"), PIXBUF_INLINE_ICON_GRAYSCALE},
 123         {"OverUnderExposed",    N_("Over Under Exposed"), PIXBUF_INLINE_ICON_EXPOSURE},
 124         {"HideTools",   N_("Hide file list"), PIXBUF_INLINE_ICON_HIDETOOLS},
 125         {"SlideShowPause",      N_("Pause slideshow"), GTK_STOCK_MEDIA_PAUSE},
 126         {"SlideShowFaster",     N_("Slideshow Faster"), GTK_STOCK_FILE},
 127         {"SlideShowSlower",     N_("Slideshow Slower"), GTK_STOCK_FILE},
 128         {"Refresh",     N_("Refresh"), GTK_STOCK_REFRESH},
 129         {"HelpContents",        N_("Help"), GTK_STOCK_HELP},
 130         {"ExifWin",     N_("Exif window"), PIXBUF_INLINE_ICON_EXIF},
 131         {"Thumbnails",  N_("Show thumbnails"), PIXBUF_INLINE_ICON_THUMB},
 132         {"ShowMarks",   N_("Show marks"), PIXBUF_INLINE_ICON_MARKS},
 133         {"ImageGuidelines",     N_("Show guidelines"), PIXBUF_INLINE_ICON_GUIDELINES},
 134         {"DrawRectangle",       N_("Draw Rectangle"), PIXBUF_INLINE_ICON_DRAW_RECTANGLE},
 135         {"FloatTools",  N_("Float file list"), PIXBUF_INLINE_ICON_FLOAT},
 136         {"SBar",        N_("Info sidebar"), PIXBUF_INLINE_ICON_INFO},
 137         {"SBarSort",    N_("Sort manager"), PIXBUF_INLINE_ICON_SORT},
 138         {"Quit",        N_("Quit"), GTK_STOCK_QUIT},
 139         {NULL,          NULL, NULL}
 140 };
 141
 142 /**
 143  * @brief
 144  * @param widget Not used
 145  * @param data Pointer to vbox list item
 146  * @param up Up/Down movement
 147  * @param single_step Move up/down one step, or to top/bottom
 148  *
 149  */
 150 static void toolbar_item_move(GtkWidget *widget, gpointer data,
 151                                                                         gboolean up, gboolean single_step)
 152 {
 153         GtkWidget *list_item = data;
 154         GtkWidget *box;
 155         gint pos = 0;
 156
 157         if (!list_item) return;
 158         box = gtk_widget_get_ancestor(list_item, GTK_TYPE_BOX);
 159         if (!box) return;
 160
 161         gtk_container_child_get(GTK_CONTAINER(box), list_item, "position", &pos, NULL);
 162
 163         if (single_step)
 164                 {
 165                 pos = up ? (pos - 1) : (pos + 1);
 166                 if (pos < 0) pos = 0;
 167                 }
 168         else
 169                 {
 170                 pos = up ? 0 : -1;
 171                 }
 172
 173         gtk_box_reorder_child(GTK_BOX(box), list_item, pos);
 174 }
 175
 176 static void toolbar_item_move_up_cb(GtkWidget *widget, gpointer data)
 177 {
 178         toolbar_item_move(widget, data, TRUE, TRUE);
 179 }
 180
 181 static void toolbar_item_move_down_cb(GtkWidget *widget, gpointer data)
 182 {
 183         toolbar_item_move(widget, data, FALSE, TRUE);
 184 }
 185
 186 static void toolbar_item_move_top_cb(GtkWidget *widget, gpointer data)
 187 {
 188         toolbar_item_move(widget, data, TRUE, FALSE);
 189 }
 190
 191 static void toolbar_item_move_bottom_cb(GtkWidget *widget, gpointer data)
 192 {
 193         toolbar_item_move(widget, data, FALSE, FALSE);
 194 }
 195
 196 static void toolbar_item_delete_cb(GtkWidget *widget, gpointer data)
 197 {
 198         gtk_widget_destroy(data);
 199 }
 200
 201 static void toolbar_menu_popup(GtkWidget *widget)
 202 {
 203         GtkWidget *menu;
 204         GtkWidget *vbox;
 205
 206         vbox = gtk_widget_get_parent(widget);
 207
 208         menu = popup_menu_short_lived();
 209
 210         if (widget)
 211                 {
 212                 menu_item_add_stock(menu, _("Move to _top"), GTK_STOCK_GOTO_TOP, G_CALLBACK(toolbar_item_move_top_cb), widget);
 213                 menu_item_add_stock(menu, _("Move _up"), GTK_STOCK_GO_UP, G_CALLBACK(toolbar_item_move_up_cb), widget);
 214                 menu_item_add_stock(menu, _("Move _down"), GTK_STOCK_GO_DOWN, G_CALLBACK(toolbar_item_move_down_cb), widget);
 215                 menu_item_add_stock(menu, _("Move to _bottom"), GTK_STOCK_GOTO_BOTTOM, G_CALLBACK(toolbar_item_move_bottom_cb), widget);
 216                 menu_item_add_divider(menu);
 217                 menu_item_add_stock(menu, _("Remove"), GTK_STOCK_DELETE, G_CALLBACK(toolbar_item_delete_cb), widget);
 218                 menu_item_add_divider(menu);
 219                 }
 220
 221         gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, vbox, 0, GDK_CURRENT_TIME);
 222 }
 223
 224 static gboolean toolbar_press_cb(GtkWidget *button, GdkEventButton *event, gpointer data)
 225 {
 226         ToolbarButtonData *button_data = data;
 227
 228         if (event->button == MOUSE_BUTTON_RIGHT)
 229                 {
 230                 toolbar_menu_popup(button_data->button);
 231                 return TRUE;
 232                 }
 233         return FALSE;
 234 }
 235
 236 static void get_toolbar_item(const gchar *name, gchar **label, gchar **stock_id)
 237 {
 238         const UseableToolbarItems *list = useable_toolbar_items;
 239         *label = NULL;
 240         *stock_id = NULL;
 241
 242         while (list->name)
 243                 {
 244                 if (g_strcmp0(list->name, name) == 0)
 245                         {
 246                         *label = g_strdup(list->label);
 247                         *stock_id = g_strdup(list->stock_id);
 248                         break;
 249                         }
 250                 list++;
 251                 }
 252 }
 253
 254
 255 static void toolbar_item_free(ToolbarButtonData *tbbd)
 256 {
 257         if (!tbbd) return;
 258
 259         g_free(tbbd->name);
 260         g_free(tbbd->stock_id);
 261         g_free(tbbd);
 262 }
 263
 264 static void toolbar_button_free(GtkWidget *widget)
 265 {
 266         g_free(g_object_get_data(G_OBJECT(widget), "toolbar_add_name"));
 267         g_free(g_object_get_data(G_OBJECT(widget), "toolbar_add_label"));
 268         g_free(g_object_get_data(G_OBJECT(widget), "toolbar_add_stock_id"));
 269 }
 270
 271 static void toolbarlist_add_button(const gchar *name, const gchar *label,
 272                                                                         const gchar *stock_id, GtkBox *box)
 273 {
 274         ToolbarButtonData *toolbar_entry;
 275         GtkWidget *hbox;
 276
 277         toolbar_entry = g_new(ToolbarButtonData,1);
 278         toolbar_entry->button = gtk_button_new();
 279         gtk_button_set_relief(GTK_BUTTON(toolbar_entry->button), GTK_RELIEF_NONE);
 280         gtk_box_pack_start(GTK_BOX(box), toolbar_entry->button, FALSE, FALSE, 0);
 281         gtk_widget_show(toolbar_entry->button);
 282
 283         g_object_set_data_full(G_OBJECT(toolbar_entry->button), "toolbarbuttondata",
 284         toolbar_entry, (GDestroyNotify)toolbar_item_free);
 285
 286         hbox = gtk_hbox_new(FALSE, PREF_PAD_BUTTON_GAP);
 287         gtk_container_add(GTK_CONTAINER(toolbar_entry->button), hbox);
 288         gtk_widget_show(hbox);
 289
 290         toolbar_entry->button_label = gtk_label_new(label);
 291         toolbar_entry->name = g_strdup(name);
 292         toolbar_entry->stock_id = g_strdup(stock_id);
 293         g_signal_connect(G_OBJECT(toolbar_entry->button), "button_release_event",
 294                                                                         G_CALLBACK(toolbar_press_cb), toolbar_entry);
 295
 296         if (toolbar_entry->stock_id)
 297                 {
 298                 GdkPixbuf *pixbuf;
 299                 gchar *iconl;
 300                 iconl = path_from_utf8(toolbar_entry->stock_id);
 301                 pixbuf = gdk_pixbuf_new_from_file(iconl, NULL);
 302                 g_free(iconl);
 303                 if (pixbuf)
 304                         {
 305                         GdkPixbuf *scaled;
 306                         gint w, h;
 307
 308                         w = h = 16;
 309                         gtk_icon_size_lookup(GTK_ICON_SIZE_BUTTON, &w, &h);
 310
 311                         scaled = gdk_pixbuf_scale_simple(pixbuf, w, h,
 312                                                          GDK_INTERP_BILINEAR);
 313                         toolbar_entry->image = gtk_image_new_from_pixbuf(scaled);
 314
 315                         g_object_unref(scaled);
 316                         g_object_unref(pixbuf);
 317                         }
 318                 else
 319                         {
 320                         toolbar_entry->image = gtk_image_new_from_stock(toolbar_entry->stock_id,
 321                                                                                                                 GTK_ICON_SIZE_BUTTON);
 322                         }
 323                 }
 324         else
 325                 {
 326                 toolbar_entry->image = gtk_image_new_from_stock(GTK_STOCK_JUMP_TO,
 327                                                                                                                 GTK_ICON_SIZE_BUTTON);
 328                 }
 329         gtk_box_pack_start(GTK_BOX(hbox), toolbar_entry->image, FALSE, FALSE, 0);
 330         gtk_widget_show(toolbar_entry->image);
 331         gtk_box_pack_start(GTK_BOX(hbox), toolbar_entry->button_label, FALSE, FALSE, 0);
 332         gtk_widget_show(toolbar_entry->button_label);
 333 }
 334
 335 static void toolbarlist_add_cb(GtkWidget *widget, gpointer data)
 336 {
 337         const gchar *name = g_object_get_data(G_OBJECT(widget), "toolbar_add_name");
 338         const gchar *label = g_object_get_data(G_OBJECT(widget), "toolbar_add_label");
 339         const gchar *stock_id = g_object_get_data(G_OBJECT(widget), "toolbar_add_stock_id");
 340         ToolbarData *tbbd = data;
 341
 342         toolbarlist_add_button(name, label, stock_id, GTK_BOX(tbbd->vbox));
 343 }
 344
 345 static void get_desktop_data(const gchar *name, gchar **label, gchar **stock_id)
 346 {
 347         GList *editors_list;
 348         GList *work;
 349         *label = NULL;
 350         *stock_id = NULL;
 351
 352         editors_list = editor_list_get();
 353         work = editors_list;
 354         while (work)
 355                 {
 356                 const EditorDescription *editor = work->data;
 357
 358                 if (g_strcmp0(name, editor->key) == 0)
 359                         {
 360                         *label = g_strdup(editor->name);
 361                         *stock_id = g_strconcat(editor->icon, ".desktop", NULL);
 362                         break;
 363                         }
 364                 work = work->next;
 365                 }
 366         g_list_free(editors_list);
 367 }
 368
 369 static void toolbar_menu_add_popup(GtkWidget *widget, gpointer data)
 370 {
 371         GtkWidget *menu;
 372         GList *editors_list;
 373         GList *work;
 374         ToolbarData *toolbarlist = data;
 375         const UseableToolbarItems *list = useable_toolbar_items;
 376
 377         menu = popup_menu_short_lived();
 378
 379         /* get standard menu item data */
 380         while (list->name)
 381                 {
 382                 GtkWidget *item;
 383                 item = menu_item_add_stock(menu, list->label, list->stock_id,
 384                                                                                 G_CALLBACK(toolbarlist_add_cb), toolbarlist);
 385                 g_object_set_data(G_OBJECT(item), "toolbar_add_name", g_strdup(list->name));
 386                 g_object_set_data(G_OBJECT(item), "toolbar_add_label", g_strdup(list->label));
 387                 g_object_set_data(G_OBJECT(item), "toolbar_add_stock_id", g_strdup(list->stock_id));
 388                 g_signal_connect(G_OBJECT(item), "destroy", G_CALLBACK(toolbar_button_free), item);
 389                 list++;
 390                 }
 391
 392         /* get desktop file data */
 393         editors_list = editor_list_get();
 394         work = editors_list;
 395         while (work)
 396                 {
 397                 const EditorDescription *editor = work->data;
 398
 399                 GtkWidget *item;
 400                 gchar *icon = g_strconcat(editor->icon, ".desktop", NULL);
 401
 402                 item = menu_item_add_stock(menu, editor->name, icon,
 403                                                                                 G_CALLBACK(toolbarlist_add_cb), toolbarlist);
 404                 g_object_set_data(G_OBJECT(item), "toolbar_add_name", g_strdup(editor->key));
 405                 g_object_set_data(G_OBJECT(item), "toolbar_add_label", g_strdup(editor->name));
 406                 g_object_set_data(G_OBJECT(item), "toolbar_add_stock_id", icon);
 407                 g_signal_connect(G_OBJECT(item), "destroy", G_CALLBACK(toolbar_button_free), item);
 408                 work = work->next;
 409                 }
 410         g_list_free(editors_list);
 411
 412         gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, widget, 0, GDK_CURRENT_TIME);
 413 }
 414
 415 static gboolean toolbar_menu_add_cb(GtkWidget *widget, gpointer data)
 416 {
 417         ToolbarData *toolbarlist = data;
 418
 419         toolbar_menu_add_popup(widget, toolbarlist);
 420         return TRUE;
 421 }
 422
 423 /**
 424  * @brief For each layoutwindow, clear toolbar and reload with current selection
 425  *
 426  */
 427 void toolbar_apply()
 428 {
 429         LayoutWindow *lw;
 430         GList *work_windows;
 431         GList *work_toolbar;
 432
 433         work_windows = layout_window_list;
 434         while (work_windows)
 435                 {
 436                 lw = work_windows->data;
 437
 438                 layout_toolbar_clear(lw, TOOLBAR_MAIN);
 439
 440                 work_toolbar = gtk_container_get_children(GTK_CONTAINER(toolbarlist->vbox));
 441                 while (work_toolbar)
 442                         {
 443                         GtkButton *button = work_toolbar->data;
 444                         ToolbarButtonData *tbbd;
 445
 446                         tbbd = g_object_get_data(G_OBJECT(button),"toolbarbuttondata");
 447                         layout_toolbar_add(lw, TOOLBAR_MAIN, tbbd->name);
 448
 449                         work_toolbar = work_toolbar->next;
 450                         }
 451                 g_list_free(work_toolbar);
 452
 453                 work_windows = work_windows->next;
 454                 }
 455
 456 }
 457
 458 /**
 459  * @brief Load the current toolbar items into the vbox
 460  * @param lw
 461  * @param box The vbox displayed in the preferences Toolbar tab
 462  *
 463  * Get the current contents of the toolbar, both menu items
 464  * and desktop items, and load them into the vbox
 465  */
 466 static void toolbarlist_populate(LayoutWindow *lw, GtkBox *box)
 467 {
 468         GList *work = g_list_first(lw->toolbar_actions[TOOLBAR_MAIN]);
 469
 470         while (work)
 471                 {
 472                 gchar *name = work->data;
 473                 gchar *label;
 474                 gchar *icon;
 475                 work = work->next;
 476
 477                 if (file_extension_match(name, ".desktop"))
 478                         {
 479                         get_desktop_data(name, &label, &icon);
 480                         }
 481                 else
 482                         {
 483                         get_toolbar_item(name, &label, &icon);
 484                         }
 485                 toolbarlist_add_button(name, label, icon, box);
 486                 }
 487 }
 488
 489 GtkWidget *toolbar_select_new(LayoutWindow *lw)
 490 {
 491         GtkWidget *scrolled;
 492         GtkWidget *tbar;
 493         GtkWidget *add_box;
 494
 495         if (!lw) return NULL;
 496
 497         if (!toolbarlist)
 498                 {
 499                 toolbarlist = g_new0(ToolbarData, 1);
 500                 }
 501         toolbarlist->lw = lw;
 502
 503         toolbarlist->widget = gtk_vbox_new(FALSE, PREF_PAD_GAP);
 504         gtk_widget_show(toolbarlist->widget);
 505
 506         scrolled = gtk_scrolled_window_new(NULL, NULL);
 507         gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
 508                                                         GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 509         gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_NONE);
 510         gtk_box_pack_start(GTK_BOX(toolbarlist->widget), scrolled, TRUE, TRUE, 0);
 511         gtk_widget_show(scrolled);
 512
 513         toolbarlist->vbox = gtk_vbox_new(FALSE, 0);
 514         gtk_widget_show(toolbarlist->vbox);
 515         gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), toolbarlist->vbox);
 516         gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(scrolled))),
 517                                                                                                                                 GTK_SHADOW_NONE);
 518
 519         add_box = gtk_vbox_new(FALSE, 0);
 520         gtk_widget_show(add_box);
 521         gtk_box_pack_end(GTK_BOX(toolbarlist->widget), add_box, FALSE, FALSE, 0);
 522         tbar = pref_toolbar_new(add_box, GTK_TOOLBAR_ICONS);
 523         toolbarlist->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, "NULL", FALSE,
 524                                                                                         _("Add Toolbar Item"),
 525                                                                                         G_CALLBACK(toolbar_menu_add_cb), toolbarlist);
 526         gtk_widget_show(toolbarlist->add_button);
 527
 528         toolbarlist_populate(lw,GTK_BOX(toolbarlist->vbox));
 529
 530         return toolbarlist->widget;
 531 }
 532
 533 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */