callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: Introduce and use GimpFileChooserAction

Browse Source 
Introduce and use GimpFileChooserAction in the core so that we can
differentiate Save from Export later.
This commit is contained in:
Martin Nordholts
2009-04-24 07:36:41 +02:00
parent acef48602c
commit 3025dac653
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/dialogs/file-open-dialog.c
View File

@ -73,7 +73,7 @@ file_open_dialog_new (Gimp *gimp)
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL); g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
dialog = gimp_file_dialog_new (gimp, dialog = gimp_file_dialog_new (gimp,
GTK_FILE_CHOOSER_ACTION_OPEN, GIMP_FILE_CHOOSER_ACTION_OPEN,
_("Open Image"), "gimp-file-open", _("Open Image"), "gimp-file-open",
GTK_STOCK_OPEN, GTK_STOCK_OPEN,
GIMP_HELP_FILE_OPEN); GIMP_HELP_FILE_OPEN);

2
app/dialogs/file-save-dialog.c
View File

@ -87,7 +87,7 @@ file_save_dialog_new (Gimp *gimp)
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL); g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
dialog = gimp_file_dialog_new (gimp, dialog = gimp_file_dialog_new (gimp,
GTK_FILE_CHOOSER_ACTION_SAVE, GIMP_FILE_CHOOSER_ACTION_SAVE,
_("Save Image"), "gimp-file-save", _("Save Image"), "gimp-file-save",
GTK_STOCK_SAVE, GTK_STOCK_SAVE,
GIMP_HELP_FILE_SAVE); GIMP_HELP_FILE_SAVE);

11
app/widgets/gimpfiledialog.c
View File

@ -287,7 +287,7 @@ gimp_file_dialog_progress_get_window (GimpProgress *progress)
GtkWidget * GtkWidget *
gimp_file_dialog_new (Gimp *gimp, gimp_file_dialog_new (Gimp *gimp,
GtkFileChooserAction action, GimpFileChooserAction action,
const gchar *title, const gchar *title,
const gchar *role, const gchar *role,
const gchar *stock_id, const gchar *stock_id,
@ -298,6 +298,7 @@ gimp_file_dialog_new (Gimp *gimp,
const gchar *automatic; const gchar *automatic;
const gchar *automatic_help_id; const gchar *automatic_help_id;
gboolean local_only; gboolean local_only;
GtkFileChooserAction gtk_action;
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL); g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
g_return_val_if_fail (title != NULL, NULL); g_return_val_if_fail (title != NULL, NULL);
@ -307,7 +308,8 @@ gimp_file_dialog_new (Gimp *gimp,
switch (action) switch (action)
{ {
case GTK_FILE_CHOOSER_ACTION_OPEN: case GIMP_FILE_CHOOSER_ACTION_OPEN:
gtk_action = GTK_FILE_CHOOSER_ACTION_OPEN;
file_procs = gimp->plug_in_manager->load_procs; file_procs = gimp->plug_in_manager->load_procs;
automatic = _("Automatically Detected"); automatic = _("Automatically Detected");
automatic_help_id = GIMP_HELP_FILE_OPEN_BY_EXTENSION; automatic_help_id = GIMP_HELP_FILE_OPEN_BY_EXTENSION;
@ -317,7 +319,8 @@ gimp_file_dialog_new (Gimp *gimp,
"file-uri-load") == NULL); "file-uri-load") == NULL);
break; break;
case GTK_FILE_CHOOSER_ACTION_SAVE: case GIMP_FILE_CHOOSER_ACTION_SAVE:
gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
file_procs = gimp->plug_in_manager->save_procs; file_procs = gimp->plug_in_manager->save_procs;
automatic = _("By Extension"); automatic = _("By Extension");
automatic_help_id = GIMP_HELP_FILE_SAVE_BY_EXTENSION; automatic_help_id = GIMP_HELP_FILE_SAVE_BY_EXTENSION;
@ -335,7 +338,7 @@ gimp_file_dialog_new (Gimp *gimp,
dialog = g_object_new (GIMP_TYPE_FILE_DIALOG, dialog = g_object_new (GIMP_TYPE_FILE_DIALOG,
"title", title, "title", title,
"role", role, "role", role,
"action", action, "action", gtk_action,
"local-only", local_only, "local-only", local_only,
"do-overwrite-confirmation", TRUE, "do-overwrite-confirmation", TRUE,
NULL); NULL);

2
app/widgets/gimpfiledialog.h
View File

@ -66,7 +66,7 @@ typedef struct _GimpFileDialogState GimpFileDialogState;
GType gimp_file_dialog_get_type (void) G_GNUC_CONST; GType gimp_file_dialog_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_file_dialog_new (Gimp *gimp, GtkWidget * gimp_file_dialog_new (Gimp *gimp,
GtkFileChooserAction action, GimpFileChooserAction action,
const gchar *title, const gchar *title,
const gchar *role, const gchar *role,
const gchar *stock_id, const gchar *stock_id,

7
app/widgets/widgets-enums.h
View File

@ -307,5 +307,12 @@ typedef enum /*< skip >*/
GIMP_DEVICE_VALUE_GRADIENT = 1 << 8 GIMP_DEVICE_VALUE_GRADIENT = 1 << 8
} GimpDeviceValues; } GimpDeviceValues;
typedef enum /*< skip >*/
{
GIMP_FILE_CHOOSER_ACTION_OPEN,
GIMP_FILE_CHOOSER_ACTION_SAVE,
GIMP_FILE_CHOOSER_ACTION_EXPORT
} GimpFileChooserAction;
#endif /* __WIDGETS_ENUMS_H__ */ #endif /* __WIDGETS_ENUMS_H__ */