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