AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

file chooser: Clean up direct action area interaction

Browse Source
This commit is contained in:
Matthias Clasen 2014-01-15 06:44:48 -05:00
parent abe29dd188
commit 3d354026ca
1 changed files with 36 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
gtk/gtkfilechooserdialog.c
View File

@ -267,6 +267,28 @@ gtk_file_chooser_dialog_init (GtkFileChooserDialog *dialog)
GTK_FILE_CHOOSER (dialog->priv->widget)); GTK_FILE_CHOOSER (dialog->priv->widget));
} }
static GtkWidget *
get_accept_action_widget (GtkDialog *dialog)
{
gint response[] = {
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_OK,
GTK_RESPONSE_YES,
GTK_RESPONSE_APPLY
};
gint i;
GtkWidget *widget;
for (i = 0; i < G_N_ELEMENTS (response); i++)
{
widget = gtk_dialog_get_widget_for_response (dialog, response[i]);
if (widget && gtk_widget_is_sensitive (widget))
return widget;
}
return NULL;
}
static gboolean static gboolean
is_stock_accept_response_id (int response_id) is_stock_accept_response_id (int response_id)
{ {
@ -281,9 +303,7 @@ static void
file_chooser_widget_file_activated (GtkFileChooser *chooser, file_chooser_widget_file_activated (GtkFileChooser *chooser,
GtkFileChooserDialog *dialog) GtkFileChooserDialog *dialog)
{ {
GtkDialog *fc_dialog = GTK_DIALOG (dialog); GtkWidget *widget;
GtkWidget *action_area;
GList *children, *l;
if (gtk_window_activate_default (GTK_WINDOW (dialog))) if (gtk_window_activate_default (GTK_WINDOW (dialog)))
return; return;
@ -291,27 +311,9 @@ file_chooser_widget_file_activated (GtkFileChooser *chooser,
/* There probably isn't a default widget, so make things easier for the /* There probably isn't a default widget, so make things easier for the
* programmer by looking for a reasonable button on our own. * programmer by looking for a reasonable button on our own.
*/ */
G_GNUC_BEGIN_IGNORE_DEPRECATIONS widget = get_accept_action_widget (GTK_DIALOG (dialog));
action_area = gtk_dialog_get_action_area (fc_dialog); if (widget)
G_GNUC_END_IGNORE_DEPRECATIONS gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */
children = gtk_container_get_children (GTK_CONTAINER (action_area));
for (l = children; l; l = l->next)
{
GtkWidget *widget;
int response_id;
widget = GTK_WIDGET (l->data);
response_id = gtk_dialog_get_response_for_widget (fc_dialog, widget);
if (gtk_widget_is_sensitive (widget) &&
is_stock_accept_response_id (response_id))
{
gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */
break;
}
}
g_list_free (children);
} }
#if 0 #if 0
@ -383,9 +385,7 @@ static void
file_chooser_widget_response_requested (GtkWidget *widget, file_chooser_widget_response_requested (GtkWidget *widget,
GtkFileChooserDialog *dialog) GtkFileChooserDialog *dialog)
{ {
GtkDialog *fc_dialog = GTK_DIALOG (dialog); GtkWidget *button;
GtkWidget *action_area;
GList *children, *l;
dialog->priv->response_requested = TRUE; dialog->priv->response_requested = TRUE;
@ -395,30 +395,14 @@ file_chooser_widget_response_requested (GtkWidget *widget,
/* There probably isn't a default widget, so make things easier for the /* There probably isn't a default widget, so make things easier for the
* programmer by looking for a reasonable button on our own. * programmer by looking for a reasonable button on our own.
*/ */
G_GNUC_BEGIN_IGNORE_DEPRECATIONS button = get_accept_action_widget (GTK_DIALOG (dialog));
action_area = gtk_dialog_get_action_area (fc_dialog); if (button)
G_GNUC_END_IGNORE_DEPRECATIONS
children = gtk_container_get_children (GTK_CONTAINER (action_area));
for (l = children; l; l = l->next)
{ {
GtkWidget *widget; gtk_widget_activate (button);
int response_id; return;
widget = GTK_WIDGET (l->data);
response_id = gtk_dialog_get_response_for_widget (fc_dialog, widget);
if (gtk_widget_is_sensitive (widget) &&
is_stock_accept_response_id (response_id))
{
gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */
break;
}
} }
if (l == NULL) dialog->priv->response_requested = FALSE;
dialog->priv->response_requested = FALSE;
g_list_free (children);
} }
static void static void
@ -453,29 +437,14 @@ gtk_file_chooser_dialog_get_property (GObject *object,
g_object_get_property (G_OBJECT (priv->widget), pspec->name, value); g_object_get_property (G_OBJECT (priv->widget), pspec->name, value);
} }
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 static void
ensure_default_response (GtkFileChooserDialog *dialog) ensure_default_response (GtkFileChooserDialog *dialog)
{ {
GtkWidget *action_area; GtkWidget *widget;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS widget = get_accept_action_widget (GTK_DIALOG (dialog));
action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog)); if (widget)
G_GNUC_END_IGNORE_DEPRECATIONS gtk_widget_grab_default (widget);
gtk_container_foreach (GTK_CONTAINER (action_area),
foreach_ensure_default_response_cb,
dialog);
} }
/* GtkWidget::map handler */ /* GtkWidget::map handler */