diff options
| author | Federico Mena Quintero <federico@ximian.com> | 2004-11-30 00:00:07 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2004-11-30 00:00:07 +0000 |
| commit | d5323addf5b460775d1959095cc0244645d8f9f0 (patch) | |
| tree | 0eb785c0d367bea03124ef85a85e6ca6cb0d1530 | |
| parent | f985442ade013276bf461482be27091e503272bf (diff) | |
| download | gdk-pixbuf-d5323addf5b460775d1959095cc0244645d8f9f0.tar.gz | |
Merged from gtk-2-4:
2004-11-29 Federico Mena Quintero <federico@ximian.com>
Merged from gtk-2-4:
* gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle
Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions. This
lets us navigate thei file system more easily.
(gtk_file_chooser_default_should_respond): If we are in
SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is
selected.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 11 | ||||
| -rw-r--r-- | gtk/gtkfilechooserdefault.c | 24 |
5 files changed, 55 insertions, 13 deletions
@@ -1,3 +1,14 @@ +2004-11-29 Federico Mena Quintero <federico@ximian.com> + + Merged from gtk-2-4: + + * gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle + Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions. This + lets us navigate thei file system more easily. + (gtk_file_chooser_default_should_respond): If we are in + SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is + selected. + Mon Nov 29 17:51:51 2004 Søren Sandmann <sandmann@redhat.com> * gtk/gtksequence.c (_gtk_sequence_sort_changed): If the item is diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index de120ef2f..846342f82 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +2004-11-29 Federico Mena Quintero <federico@ximian.com> + + Merged from gtk-2-4: + + * gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle + Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions. This + lets us navigate thei file system more easily. + (gtk_file_chooser_default_should_respond): If we are in + SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is + selected. + Mon Nov 29 17:51:51 2004 Søren Sandmann <sandmann@redhat.com> * gtk/gtksequence.c (_gtk_sequence_sort_changed): If the item is diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index de120ef2f..846342f82 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +2004-11-29 Federico Mena Quintero <federico@ximian.com> + + Merged from gtk-2-4: + + * gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle + Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions. This + lets us navigate thei file system more easily. + (gtk_file_chooser_default_should_respond): If we are in + SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is + selected. + Mon Nov 29 17:51:51 2004 Søren Sandmann <sandmann@redhat.com> * gtk/gtksequence.c (_gtk_sequence_sort_changed): If the item is diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index de120ef2f..846342f82 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +2004-11-29 Federico Mena Quintero <federico@ximian.com> + + Merged from gtk-2-4: + + * gtk/gtkfilechooserdefault.c (trap_activate_cb): Don't handle + Enter if we are in SELECT_FOLDER or CREATE_FOLDER actions. This + lets us navigate thei file system more easily. + (gtk_file_chooser_default_should_respond): If we are in + SELECT_FOLDER or CREATE_FOLDER modes, return TRUE if something is + selected. + Mon Nov 29 17:51:51 2004 Søren Sandmann <sandmann@redhat.com> * gtk/gtksequence.c (_gtk_sequence_sort_changed): If the item is diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index a13174835..60c827b1e 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -2867,10 +2867,12 @@ trap_activate_cb (GtkWidget *widget, return TRUE; } - if (event->keyval == GDK_Return - || event->keyval == GDK_ISO_Enter - || event->keyval == GDK_KP_Enter - || event->keyval == GDK_space) + if ((event->keyval == GDK_Return + || event->keyval == GDK_ISO_Enter + || event->keyval == GDK_KP_Enter + || event->keyval == GDK_space) + && !(impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER || + impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)) { GtkWindow *window; @@ -5036,17 +5038,13 @@ gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed) selection_check (impl, &num_selected, &all_files, &all_folders); - if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER) + if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + || impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER) { - if (num_selected != 1) - return TRUE; /* zero means current folder; more than one means use the whole selection */ - else if (current_focus != impl->browse_files_tree_view) - { - /* a single folder is selected and a button was clicked */ - switch_to_selected_folder (impl); - return TRUE; - } + if (num_selected > 0) + return TRUE; } + if (num_selected == 0) { if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE |