← Back to branch summary

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

« back to all changes in this revision

Viewing changes to app/dialogs/layer-options-dialog.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-10-06 13:30:41 UTC
  • mto: This revision was merged to the branch mainline in revision 35.
  • Revision ID: james.westby@ubuntu.com-20081006133041-3panbkcanaymfsmp
Tags: upstream-2.6.0
Import upstream version 2.6.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/dialogs/layer-options-dialog.c
130
130
 
131
131
  if (! layer)
132
132
    {
 
133
      gdouble xres;
 
134
      gdouble yres;
 
135
 
 
136
      gimp_image_get_resolution (image, &xres, &yres);
 
137
 
133
138
      /*  The size labels  */
134
139
      label = gtk_label_new (_("Width:"));
135
140
      gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
145
150
 
146
151
      /*  The size sizeentry  */
147
152
      spinbutton = gimp_spin_button_new (&adjustment,
148
 
                                         1, 1, 1, 1, 10, 1,
 
153
                                         1, 1, 1, 1, 10, 0,
149
154
                                         1, 2);
150
155
      gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 10);
151
156
 
169
174
                                GIMP_UNIT_PIXEL);
170
175
 
171
176
      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (options->size_se), 0,
172
 
                                      image->xresolution, FALSE);
 
177
                                      xres, FALSE);
173
178
      gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (options->size_se), 1,
174
 
                                      image->yresolution, FALSE);
 
179
                                      yres, FALSE);
175
180
 
176
181
      gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (options->size_se), 0,
177
182
                                             GIMP_MIN_IMAGE_SIZE,
181
186
                                             GIMP_MAX_IMAGE_SIZE);
182
187
 
183
188
      gimp_size_entry_set_size (GIMP_SIZE_ENTRY (options->size_se), 0,
184
 
                                0, image->width);
 
189
                                0, gimp_image_get_width  (image));
185
190
      gimp_size_entry_set_size (GIMP_SIZE_ENTRY (options->size_se), 1,
186
 
                                0, image->height);
 
191
                                0, gimp_image_get_height (image));
187
192
 
188
193
      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (options->size_se), 0,
189
 
                                  image->width);
 
194
                                  gimp_image_get_width  (image));
190
195
      gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (options->size_se), 1,
191
 
                                  image->height);
 
196
                                  gimp_image_get_height (image));
192
197
 
193
198
      /*  The radio frame  */
194
199
      frame = gimp_enum_radio_frame_new_with_range (GIMP_TYPE_FILL_TYPE,
234
239
layer_options_dialog_toggle_rename (GtkWidget          *widget,
235
240
                                    LayerOptionsDialog *options)
236
241
{
237
 
  if (GTK_TOGGLE_BUTTON (widget)->active &&
 
242
  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) &&
238
243
      gimp_drawable_is_text_layer (GIMP_DRAWABLE (options->layer)))
239
244
    {
240
245
      GimpTextLayer *text_layer = GIMP_TEXT_LAYER (options->layer);