mirror of https://github.com/GNOME/gimp.git
app/gui/file-dialog-utils.c app/widgets/gimpfiledialog.c some irrelevant
2004-02-27 Michael Natterer <mitch@gimp.org> * app/gui/file-dialog-utils.c * app/widgets/gimpfiledialog.c * libgimpwidgets/gimpfileentry.[ch]: some irrelevant micro changes to make that patch smaller.
This commit is contained in:
parent
d880e7f2d8
commit
5bdd1635c8
|
@ -1,3 +1,10 @@
|
|||
2004-02-27 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/gui/file-dialog-utils.c
|
||||
* app/widgets/gimpfiledialog.c
|
||||
* libgimpwidgets/gimpfileentry.[ch]: some irrelevant micro changes
|
||||
to make that patch smaller.
|
||||
|
||||
2004-02-27 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/gui/file-open-dialog.c
|
||||
|
|
|
@ -39,9 +39,7 @@ file_dialog_show (GtkWidget *dialog,
|
|||
gimp_item_factories_set_sensitive ("<Image>", "/File/Save as...", FALSE);
|
||||
gimp_item_factories_set_sensitive ("<Image>", "/File/Save a Copy...", FALSE);
|
||||
|
||||
gtk_window_set_screen (GTK_WINDOW (dialog),
|
||||
gtk_widget_get_screen (parent));
|
||||
|
||||
gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (parent));
|
||||
gtk_widget_grab_focus (GTK_FILE_SELECTION (dialog)->selection_entry);
|
||||
gtk_window_present (GTK_WINDOW (dialog));
|
||||
}
|
||||
|
|
|
@ -39,9 +39,7 @@ file_dialog_show (GtkWidget *dialog,
|
|||
gimp_item_factories_set_sensitive ("<Image>", "/File/Save as...", FALSE);
|
||||
gimp_item_factories_set_sensitive ("<Image>", "/File/Save a Copy...", FALSE);
|
||||
|
||||
gtk_window_set_screen (GTK_WINDOW (dialog),
|
||||
gtk_widget_get_screen (parent));
|
||||
|
||||
gtk_window_set_screen (GTK_WINDOW (dialog), gtk_widget_get_screen (parent));
|
||||
gtk_widget_grab_focus (GTK_FILE_SELECTION (dialog)->selection_entry);
|
||||
gtk_window_present (GTK_WINDOW (dialog));
|
||||
}
|
||||
|
|
|
@ -178,18 +178,16 @@ gimp_file_dialog_new (Gimp *gimp,
|
|||
gtk_widget_show (hbox);
|
||||
|
||||
option_menu = gtk_option_menu_new ();
|
||||
gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu),
|
||||
GTK_ITEM_FACTORY (dialog->item_factory)->widget);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), option_menu, FALSE, FALSE, 0);
|
||||
gtk_widget_show (option_menu);
|
||||
|
||||
gtk_option_menu_set_menu (GTK_OPTION_MENU (option_menu),
|
||||
GTK_ITEM_FACTORY (dialog->item_factory)->widget);
|
||||
|
||||
label = gtk_label_new_with_mnemonic (_("Determine File _Type:"));
|
||||
gtk_label_set_mnemonic_widget (GTK_LABEL (label), option_menu);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
|
||||
gtk_widget_show (label);
|
||||
|
||||
gtk_label_set_mnemonic_widget (GTK_LABEL (label), option_menu);
|
||||
|
||||
if (gimp->config->thumbnail_size > 0)
|
||||
{
|
||||
GtkFileSelection *fs = GTK_FILE_SELECTION (dialog);
|
||||
|
@ -206,10 +204,9 @@ gimp_file_dialog_new (Gimp *gimp,
|
|||
for (hbox = fs->dir_list; ! GTK_IS_HBOX (hbox); hbox = hbox->parent);
|
||||
|
||||
dialog->thumb_box = gimp_thumb_box_new (gimp);
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (dialog->thumb_box), FALSE);
|
||||
gtk_box_pack_end (GTK_BOX (hbox), dialog->thumb_box, FALSE, FALSE, 0);
|
||||
gtk_widget_show (dialog->thumb_box);
|
||||
|
||||
gtk_widget_set_sensitive (GTK_WIDGET (dialog->thumb_box), FALSE);
|
||||
}
|
||||
|
||||
return GTK_WIDGET (dialog);
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball
|
||||
*
|
||||
* gimpfileentry.c
|
||||
* Copyright (C) 1999-2003 Michael Natterer <mitch@gimp.org>
|
||||
* Copyright (C) 1999-2004 Michael Natterer <mitch@gimp.org>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
|
@ -98,9 +98,7 @@ gimp_file_entry_get_type (void)
|
|||
static void
|
||||
gimp_file_entry_class_init (GimpFileEntryClass *klass)
|
||||
{
|
||||
GtkObjectClass *object_class;
|
||||
|
||||
object_class = GTK_OBJECT_CLASS (klass);
|
||||
GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
|
||||
|
||||
parent_class = g_type_class_peek_parent (klass);
|
||||
|
||||
|
@ -331,7 +329,6 @@ gimp_file_entry_filesel_response (GtkWidget *dialog,
|
|||
const gchar *filename;
|
||||
|
||||
filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION (dialog));
|
||||
|
||||
gimp_file_entry_set_filename (entry, filename);
|
||||
}
|
||||
|
||||
|
|
|
@ -69,10 +69,10 @@ struct _GimpFileEntryClass
|
|||
|
||||
GType gimp_file_entry_get_type (void) G_GNUC_CONST;
|
||||
|
||||
GtkWidget * gimp_file_entry_new (const gchar *title,
|
||||
const gchar *filename,
|
||||
gboolean dir_only,
|
||||
gboolean check_valid);
|
||||
GtkWidget * gimp_file_entry_new (const gchar *title,
|
||||
const gchar *filename,
|
||||
gboolean dir_only,
|
||||
gboolean check_valid);
|
||||
|
||||
gchar * gimp_file_entry_get_filename (GimpFileEntry *entry);
|
||||
void gimp_file_entry_set_filename (GimpFileEntry *entry,
|
||||
|
|
Loading…
Reference in New Issue