← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/xpad/oneiric

« back to all changes in this revision

Viewing changes to src/xpad-toolbar.c

  • Committer: Bazaar Package Importer
  • Author(s): Bart Martens
  • Date: 2007-12-10 22:52:37 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20071210225237-llvwje5iwbbi5adw
Tags: 2.13-1
* New upstream release.
* debian/patches/01_workspaces.diff: Removed.
* debian/menu: Updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xpad-toolbar.c
1
1
/*
2
2
 
3
 
Copyright (c) 2001-2004 Michael Terry
 
3
Copyright (c) 2001-2007 Michael Terry
4
4
 
5
5
This program is free software; you can redistribute it and/or modify
6
6
it under the terms of the GNU General Public License as published by
37
37
 
38
38
struct XpadToolbarPrivate
39
39
{
40
 
        GtkTooltips *tooltips;
41
 
        
42
40
        GtkToolItem *move_button;
43
41
        gboolean move_removed;
44
42
        guint move_index;
79
77
        {"New", "gtk-new", ACTIVATE_NEW, XPAD_BUTTON_TYPE_BUTTON, N_("Open New Pad"), N_("Add _New to Toolbar")},
80
78
        {"Preferences", "gtk-preferences", ACTIVATE_PREFERENCES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Preferences"), N_("Add Pr_eferences to Toolbar")},
81
79
        {"Properties", "gtk-properties", ACTIVATE_PROPERTIES, XPAD_BUTTON_TYPE_BUTTON, N_("Edit Pad Properties"), N_("Add Proper_ties to Toolbar")},
82
 
        {"Quit", "gtk-quit", ACTIVATE_QUIT, XPAD_BUTTON_TYPE_BUTTON, N_("Close All Pads"), N_("Add _Quit to Toolbar")},
 
80
        {"Quit", "gtk-quit", ACTIVATE_QUIT, XPAD_BUTTON_TYPE_BUTTON, N_("Close All Pads"), N_("Add Close _All to Toolbar")},
83
81
        {"sep", NULL, 0, XPAD_BUTTON_TYPE_SEPARATOR, NULL, N_("Add a Se_parator to Toolbar")} /* Separator */
84
82
        /*{"Minimize to Tray", "gtk-goto-bottom", 1, N_("Minimize Pads to System Tray")}*/
85
83
};
202
200
{
203
201
        toolbar->priv = XPAD_TOOLBAR_GET_PRIVATE (toolbar);
204
202
        
205
 
        toolbar->priv->tooltips = gtk_tooltips_new ();
206
 
        g_object_ref (toolbar->priv->tooltips);
207
 
        gtk_object_sink (GTK_OBJECT (toolbar->priv->tooltips));
208
 
        
209
203
        toolbar->priv->move_motion_handler = 0;
210
204
        toolbar->priv->move_button_release_handler = 0;
211
205
        toolbar->priv->move_key_press_handler = 0;
212
206
        
213
 
        gtk_toolbar_set_tooltips (GTK_TOOLBAR (toolbar), TRUE);
214
 
        gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
215
 
        gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE);
216
 
        gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU);
 
207
        g_object_set (G_OBJECT (toolbar),
 
208
                      "icon-size", GTK_ICON_SIZE_MENU,
 
209
                      "show-arrow", FALSE,
 
210
                      "toolbar-style", GTK_TOOLBAR_ICONS,
 
211
                      NULL);
217
212
        
218
213
        g_signal_connect_swapped (xpad_settings (), "change-buttons", G_CALLBACK (xpad_toolbar_change_buttons), toolbar);
219
214
        
225
220
{
226
221
        XpadToolbar *toolbar = XPAD_TOOLBAR (object);
227
222
        
228
 
        g_object_unref (toolbar->priv->tooltips);
229
 
        
230
223
        if (toolbar->priv->move_button)
231
224
                g_object_unref (toolbar->priv->move_button);
232
225
        
293
286
        g_object_set_data (G_OBJECT (item), "xpad-tb", (gpointer) button);
294
287
        
295
288
        if (button->desc)
296
 
                gtk_tool_item_set_tooltip (item, toolbar->priv->tooltips, _(button->desc), _(button->desc));
 
289
                gtk_tool_item_set_tooltip_text (item, _(button->desc));
297
290
        
298
291
        child = gtk_bin_get_child (GTK_BIN (item));
299
292
        if (child)