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