← Back to branch summary

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

« back to all changes in this revision

Viewing changes to app/dialogs/image-scale-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/image-scale-dialog.c
18
18
 
19
19
#include "config.h"
20
20
 
 
21
#include <string.h>
 
22
 
21
23
#include <gtk/gtk.h>
22
24
 
23
25
#include "libgimpbase/gimpbase.h"
106
108
 
107
109
  dialog->image  = image;
108
110
  dialog->dialog = scale_dialog_new (GIMP_VIEWABLE (image), context,
109
 
                                     Q_("dialog-title|Scale Image"),
 
111
                                     C_("dialog-title", "Scale Image"),
110
112
                                     "gimp-image-scale",
111
113
                                     parent,
112
114
                                     gimp_standard_help_func,
169
171
      break;
170
172
 
171
173
    case GIMP_IMAGE_SCALE_OK:
172
 
      /* If all is well, return directly after scaling image. */
 
174
      gtk_widget_hide (widget);
173
175
      dialog->callback (dialog->dialog,
174
176
                        GIMP_VIEWABLE (dialog->image),
175
177
                        dialog->width,
232
234
  GtkWidget *widget = image_scale_confirm_dialog (dialog);
233
235
  gchar     *size;
234
236
 
235
 
  size = gimp_memsize_to_string (new_memsize);
 
237
  size = g_format_size_for_display (new_memsize);
236
238
  gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (widget)->box,
237
239
                                     _("You are trying to create an image "
238
240
                                       "with a size of %s."), size);
239
241
  g_free (size);
240
242
 
241
 
  size = gimp_memsize_to_string (max_memsize);
 
243
  size = g_format_size_for_display (max_memsize);
242
244
  gimp_message_box_set_text (GIMP_MESSAGE_DIALOG (widget)->box,
243
245
                             _("Scaling the image to the chosen size will "
244
246
                               "make it use more memory than what is "
273
275
 
274
276
  if (response_id == GTK_RESPONSE_OK)
275
277
    {
 
278
      gtk_widget_hide (dialog->dialog);
276
279
      dialog->callback (dialog->dialog,
277
280
                        GIMP_VIEWABLE (dialog->image),
278
281
                        dialog->width,