← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/gimp/jaunty-security

« back to all changes in this revision

Viewing changes to app/widgets/gimptoolbox-indicator-area.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Holbach
  • Date: 2007-05-02 16:33:03 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070502163303-bvzhjzbpw8qglc4y
Tags: 2.3.16-1ubuntu1
* Resynchronized with Debian, remaining Ubuntu changes:
  - debian/rules: i18n magic.
* debian/control.in:
  - Maintainer: Ubuntu Core Developers <ubuntu-devel@lists.ubuntu.com>
* debian/patches/02_help-message.patch,
  debian/patches/03_gimp.desktop.in.in.patch,
  debian/patches/10_dont_show_wizard.patch: updated.
* debian/patches/04_composite-signedness.patch,
  debian/patches/05_add-letter-spacing.patch: dropped, used upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/widgets/gimptoolbox-indicator-area.c
1
 
/* The GIMP -- an image manipulation program
 
1
/* GIMP - The GNU Image Manipulation Program
2
2
 * Copyright (C) 1995 Spencer Kimball and Peter Mattis
3
3
 *
4
4
 * This program is free software; you can redistribute it and/or modify
59
59
 
60
60
static void
61
61
brush_preview_drop_brush (GtkWidget    *widget,
 
62
                          gint          x,
 
63
                          gint          y,
62
64
                          GimpViewable *viewable,
63
65
                          gpointer      data)
64
66
{
79
81
 
80
82
static void
81
83
pattern_preview_drop_pattern (GtkWidget    *widget,
 
84
                              gint          x,
 
85
                              gint          y,
82
86
                              GimpViewable *viewable,
83
87
                              gpointer      data)
84
88
{
99
103
 
100
104
static void
101
105
gradient_preview_drop_gradient (GtkWidget    *widget,
 
106
                                gint          x,
 
107
                                gint          y,
102
108
                                GimpViewable *viewable,
103
109
                                gpointer      data)
104
110
{
130
136
  /*  brush view  */
131
137
 
132
138
  brush_view =
133
 
    gimp_view_new_full_by_types (GIMP_TYPE_VIEW, GIMP_TYPE_BRUSH,
 
139
    gimp_view_new_full_by_types (context,
 
140
                                 GIMP_TYPE_VIEW, GIMP_TYPE_BRUSH,
134
141
                                 CELL_SIZE, CELL_SIZE, 0,
135
142
                                 FALSE, TRUE, TRUE);
136
143
  gimp_view_set_viewable (GIMP_VIEW (brush_view),
143
150
                           _("The active brush.\n"
144
151
                             "Click to open the Brush Dialog."), NULL);
145
152
 
146
 
  g_signal_connect_object (context, "brush_changed",
 
153
  g_signal_connect_object (context, "brush-changed",
147
154
                           G_CALLBACK (gimp_view_set_viewable),
148
155
                           brush_view,
149
156
                           G_CONNECT_SWAPPED);
160
167
  /*  pattern view  */
161
168
 
162
169
  pattern_view =
163
 
    gimp_view_new_full_by_types (GIMP_TYPE_VIEW, GIMP_TYPE_PATTERN,
 
170
    gimp_view_new_full_by_types (context,
 
171
                                 GIMP_TYPE_VIEW, GIMP_TYPE_PATTERN,
164
172
                                 CELL_SIZE, CELL_SIZE, 0,
165
173
                                 FALSE, TRUE, TRUE);
166
174
  gimp_view_set_viewable (GIMP_VIEW (pattern_view),
174
182
                           _("The active pattern.\n"
175
183
                             "Click to open the Pattern Dialog."), NULL);
176
184
 
177
 
  g_signal_connect_object (context, "pattern_changed",
 
185
  g_signal_connect_object (context, "pattern-changed",
178
186
                           G_CALLBACK (gimp_view_set_viewable),
179
187
                           pattern_view,
180
188
                           G_CONNECT_SWAPPED);
191
199
  /*  gradient view  */
192
200
 
193
201
  gradient_view =
194
 
    gimp_view_new_full_by_types (GIMP_TYPE_VIEW, GIMP_TYPE_GRADIENT,
 
202
    gimp_view_new_full_by_types (context,
 
203
                                 GIMP_TYPE_VIEW, GIMP_TYPE_GRADIENT,
195
204
                                 GRAD_CELL_WIDTH, GRAD_CELL_HEIGHT, 0,
196
205
                                 FALSE, TRUE, TRUE);
197
206
  gimp_view_set_viewable (GIMP_VIEW (gradient_view),
205
214
                           _("The active gradient.\n"
206
215
                             "Click to open the Gradient Dialog."), NULL);
207
216
 
208
 
  g_signal_connect_object (context, "gradient_changed",
 
217
  g_signal_connect_object (context, "gradient-changed",
209
218
                           G_CALLBACK (gimp_view_set_viewable),
210
219
                           gradient_view,
211
220
                           G_CONNECT_SWAPPED);