mirror of
https://gitlab.gnome.org/GNOME/gimp.git
synced 2025-07-04 09:53:25 +00:00
Merge branch 'wip/schumaml/export-as-dialog-title-issue-4021' into 'master'
app: use "Export Image As" for the "Export As..." dialog title See merge request GNOME/gimp!416
This commit is contained in:
commit
e769edabff
1 changed files with 7 additions and 3 deletions
|
@ -84,6 +84,7 @@ static GtkWidget * file_save_dialog_show (Gimp *gimp,
|
||||||
static GtkWidget * file_export_dialog_show (Gimp *gimp,
|
static GtkWidget * file_export_dialog_show (Gimp *gimp,
|
||||||
GimpImage *image,
|
GimpImage *image,
|
||||||
GtkWidget *parent,
|
GtkWidget *parent,
|
||||||
|
const gchar *title,
|
||||||
GimpDisplay *display);
|
GimpDisplay *display);
|
||||||
static void file_save_dialog_response (GtkWidget *dialog,
|
static void file_save_dialog_response (GtkWidget *dialog,
|
||||||
gint response_id,
|
gint response_id,
|
||||||
|
@ -322,7 +323,7 @@ file_save_cmd_callback (GimpAction *action,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GIMP_SAVE_MODE_EXPORT_AS:
|
case GIMP_SAVE_MODE_EXPORT_AS:
|
||||||
file_export_dialog_show (gimp, image, widget, display);
|
file_export_dialog_show (gimp, image, widget, _("Export Image As"), display);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GIMP_SAVE_MODE_EXPORT:
|
case GIMP_SAVE_MODE_EXPORT:
|
||||||
|
@ -340,7 +341,7 @@ file_save_cmd_callback (GimpAction *action,
|
||||||
if (! file)
|
if (! file)
|
||||||
{
|
{
|
||||||
/* Behave as if Export As... was invoked */
|
/* Behave as if Export As... was invoked */
|
||||||
file_export_dialog_show (gimp, image, widget, display);
|
file_export_dialog_show (gimp, image, widget, _("Export Image"), display);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -706,7 +707,7 @@ file_save_dialog_response (GtkWidget *dialog,
|
||||||
|
|
||||||
other = file_export_dialog_show (GIMP_FILE_DIALOG (file_dialog)->image->gimp,
|
other = file_export_dialog_show (GIMP_FILE_DIALOG (file_dialog)->image->gimp,
|
||||||
GIMP_FILE_DIALOG (file_dialog)->image,
|
GIMP_FILE_DIALOG (file_dialog)->image,
|
||||||
GTK_WIDGET (parent), NULL);
|
GTK_WIDGET (parent), _("Export Image"), NULL);
|
||||||
|
|
||||||
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (other), folder);
|
gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (other), folder);
|
||||||
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (other), basename);
|
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (other), basename);
|
||||||
|
@ -720,6 +721,7 @@ static GtkWidget *
|
||||||
file_export_dialog_show (Gimp *gimp,
|
file_export_dialog_show (Gimp *gimp,
|
||||||
GimpImage *image,
|
GimpImage *image,
|
||||||
GtkWidget *parent,
|
GtkWidget *parent,
|
||||||
|
const gchar *title,
|
||||||
GimpDisplay *display)
|
GimpDisplay *display)
|
||||||
{
|
{
|
||||||
GtkWidget *dialog;
|
GtkWidget *dialog;
|
||||||
|
@ -758,6 +760,8 @@ file_export_dialog_show (Gimp *gimp,
|
||||||
gimp_export_dialog_set_image (GIMP_EXPORT_DIALOG (dialog), image,
|
gimp_export_dialog_set_image (GIMP_EXPORT_DIALOG (dialog), image,
|
||||||
GIMP_OBJECT (display));
|
GIMP_OBJECT (display));
|
||||||
|
|
||||||
|
gtk_window_set_title (GTK_WINDOW (dialog), title);
|
||||||
|
|
||||||
gtk_window_present (GTK_WINDOW (dialog));
|
gtk_window_present (GTK_WINDOW (dialog));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue