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

bgo505857 - GtkFileChooserDialog ensures its default response

Browse Source 
Signed-off-by: Federico Mena Quintero <federico@gnu.org>

svn path=/trunk/; revision=19727
This commit is contained in:
Federico Mena Quintero
2008-03-07 03:53:58 +00:00
committed by Federico Mena Quintero
parent 61be2a7127
commit 384dbd3c88
2 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2008-03-06 Federico Mena Quintero <federico@novell.com>
Fix http://bugzilla.gnome.org/show_bug.cgi?id=505857 -
GtkFileChooserDialog should set a default response button if the
app doesn't set it. Based on a patch by Chris Wang <chris.wang@sun.com>.
* gtk/gtkfilechooserdialog.c (is_stock_accept_response_id): New
function, refactor from where there was duplicated code.
(gtk_file_chooser_dialog_new_valist): If the response ID for the
button is one of the stock ones, make it the default response
button.
2008-03-06 Johan Dahlin <jdahlin@async.com.br> 2008-03-06 Johan Dahlin <jdahlin@async.com.br>
* docs/reference/gtk/tmpl/gtkiconfactory.sgml: * docs/reference/gtk/tmpl/gtkiconfactory.sgml:

50
gtk/gtkfilechooserdialog.c
View File

@ -112,6 +112,15 @@ gtk_file_chooser_dialog_finalize (GObject *object)
G_OBJECT_CLASS (gtk_file_chooser_dialog_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_file_chooser_dialog_parent_class)->finalize (object);
} }
static gboolean
is_stock_accept_response_id (int response_id)
{
return (response_id == GTK_RESPONSE_ACCEPT
|| response_id == GTK_RESPONSE_OK
|| response_id == GTK_RESPONSE_YES
|| response_id == GTK_RESPONSE_APPLY);
}
/* Callback used when the user activates a file in the file chooser widget */ /* Callback used when the user activates a file in the file chooser widget */
static void static void
file_chooser_widget_file_activated (GtkFileChooser *chooser, file_chooser_widget_file_activated (GtkFileChooser *chooser,
@ -135,10 +144,7 @@ file_chooser_widget_file_activated (GtkFileChooser *chooser,
widget = GTK_WIDGET (l->data); widget = GTK_WIDGET (l->data);
response_id = gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog), widget); response_id = gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog), widget);
if (response_id == GTK_RESPONSE_ACCEPT if (is_stock_accept_response_id (response_id))
|| response_id == GTK_RESPONSE_OK
|| response_id == GTK_RESPONSE_YES
|| response_id == GTK_RESPONSE_APPLY)
{ {
gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */ gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */
break; break;
@ -244,10 +250,7 @@ file_chooser_widget_response_requested (GtkWidget *widget,
widget = GTK_WIDGET (l->data); widget = GTK_WIDGET (l->data);
response_id = gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog), widget); response_id = gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog), widget);
if (response_id == GTK_RESPONSE_ACCEPT if (is_stock_accept_response_id (response_id))
|| response_id == GTK_RESPONSE_OK
|| response_id == GTK_RESPONSE_YES
|| response_id == GTK_RESPONSE_APPLY)
{ {
dialog->priv->response_requested = TRUE; dialog->priv->response_requested = TRUE;
gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */ gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */
@ -383,6 +386,26 @@ set_default_size (GtkFileChooserDialog *dialog)
} }
#endif #endif
static void
foreach_ensure_default_response_cb (GtkWidget *widget,
gpointer data)
{
GtkFileChooserDialog *dialog = GTK_FILE_CHOOSER_DIALOG (data);
int response_id;
response_id = gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog), widget);
if (is_stock_accept_response_id (response_id))
gtk_dialog_set_default_response (GTK_DIALOG (dialog), response_id);
}
static void
ensure_default_response (GtkFileChooserDialog *dialog)
{
gtk_container_foreach (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area),
foreach_ensure_default_response_cb,
dialog);
}
/* GtkWidget::map handler */ /* GtkWidget::map handler */
static void static void
gtk_file_chooser_dialog_map (GtkWidget *widget) gtk_file_chooser_dialog_map (GtkWidget *widget)
@ -390,6 +413,8 @@ gtk_file_chooser_dialog_map (GtkWidget *widget)
GtkFileChooserDialog *dialog = GTK_FILE_CHOOSER_DIALOG (widget); GtkFileChooserDialog *dialog = GTK_FILE_CHOOSER_DIALOG (widget);
GtkFileChooserDialogPrivate *priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog); GtkFileChooserDialogPrivate *priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
ensure_default_response (dialog);
if (!GTK_WIDGET_MAPPED (priv->widget)) if (!GTK_WIDGET_MAPPED (priv->widget))
gtk_widget_map (priv->widget); gtk_widget_map (priv->widget);
@ -427,12 +452,9 @@ response_cb (GtkDialog *dialog,
priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog); priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
/* Act only on response IDs we recognize */ /* Act only on response IDs we recognize */
if ((response_id == GTK_RESPONSE_ACCEPT || if (is_stock_accept_response_id (response_id)
response_id == GTK_RESPONSE_OK || && !priv->response_requested
response_id == GTK_RESPONSE_YES || && !_gtk_file_chooser_embed_should_respond (GTK_FILE_CHOOSER_EMBED (priv->widget)))
response_id == GTK_RESPONSE_APPLY) &&
!priv->response_requested &&
!_gtk_file_chooser_embed_should_respond (GTK_FILE_CHOOSER_EMBED (priv->widget)))
{ {
g_signal_stop_emission_by_name (dialog, "response"); g_signal_stop_emission_by_name (dialog, "response");
} }