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

file chooser dialog: Make action changes work

Browse Source 
We were not listening for action changes to update the
save entry.
This commit is contained in:
Matthias Clasen 2015-07-03 22:45:15 -04:00
parent bb6f698abe
commit 017025c1a7
1 changed files with 82 additions and 74 deletions

50
gtk/gtkfilechooserdialog.c
View File

@ -220,6 +220,8 @@ static void gtk_file_chooser_dialog_get_property (GObject *obj
guint prop_id,
GValue *value,
GParamSpec *pspec);
static void gtk_file_chooser_dialog_notify (GObject *object,
GParamSpec *pspec);
static void gtk_file_chooser_dialog_map (GtkWidget *widget);
static void gtk_file_chooser_dialog_unmap (GtkWidget *widget);
@ -235,6 +237,8 @@ static void file_chooser_widget_selection_changed (GtkWidget *wid
static void response_cb (GtkDialog *dialog,
gint response_id);
static void setup_save_entry (GtkFileChooserDialog *dialog);
G_DEFINE_TYPE_WITH_CODE (GtkFileChooserDialog, gtk_file_chooser_dialog, GTK_TYPE_DIALOG,
G_ADD_PRIVATE (GtkFileChooserDialog)
G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER,
@ -248,6 +252,7 @@ gtk_file_chooser_dialog_class_init (GtkFileChooserDialogClass *class)
gobject_class->set_property = gtk_file_chooser_dialog_set_property;
gobject_class->get_property = gtk_file_chooser_dialog_get_property;
gobject_class->notify = gtk_file_chooser_dialog_notify;
widget_class->map = gtk_file_chooser_dialog_map;
widget_class->unmap = gtk_file_chooser_dialog_unmap;
@ -313,12 +318,12 @@ get_accept_action_widget (GtkDialog *dialog,
}
static gboolean
is_stock_accept_response_id (int response_id)
is_stock_accept_response_id (gint response_id)
{
return (response_id == GTK_RESPONSE_ACCEPT
|| response_id == GTK_RESPONSE_OK
|| response_id == GTK_RESPONSE_YES
|| response_id == GTK_RESPONSE_APPLY);
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 */
@ -336,7 +341,7 @@ file_chooser_widget_file_activated (GtkFileChooser *chooser,
*/
widget = get_accept_action_widget (GTK_DIALOG (dialog), TRUE);
if (widget)
gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */
gtk_widget_activate (widget);
}
#if 0
@ -374,11 +379,10 @@ file_chooser_widget_default_size_changed (GtkWidget *widget,
if (gtk_widget_is_drawable (widget))
{
/* Force a size request of everything before we start. This will make sure
* that widget->requisition is meaningful. */
gtk_widget_get_preferred_size (GTK_WIDGET (dialog),
&req, NULL);
gtk_widget_get_preferred_size (widget,
&widget_req, NULL);
* that widget->requisition is meaningful.
*/
gtk_widget_get_preferred_size (GTK_WIDGET (dialog), &req, NULL);
gtk_widget_get_preferred_size (widget, &widget_req, NULL);
}
_gtk_file_chooser_embed_get_default_size (GTK_FILE_CHOOSER_EMBED (priv->widget),
@ -459,12 +463,7 @@ gtk_file_chooser_dialog_set_property (GObject *object,
priv = gtk_file_chooser_dialog_get_instance_private (GTK_FILE_CHOOSER_DIALOG (object));
switch (prop_id)
{
default:
g_object_set_property (G_OBJECT (priv->widget), pspec->name, value);
break;
}
}
static void
@ -480,6 +479,17 @@ gtk_file_chooser_dialog_get_property (GObject *object,
g_object_get_property (G_OBJECT (priv->widget), pspec->name, value);
}
static void
gtk_file_chooser_dialog_notify (GObject *object,
GParamSpec *pspec)
{
if (strcmp (pspec->name, "action") == 0)
setup_save_entry (GTK_FILE_CHOOSER_DIALOG (object));
if (G_OBJECT_CLASS (gtk_file_chooser_dialog_parent_class)->notify)
G_OBJECT_CLASS (gtk_file_chooser_dialog_parent_class)->notify (object, pspec);
}
static void
add_button (GtkWidget *button, gpointer data)
{
@ -586,7 +596,6 @@ ensure_default_response (GtkFileChooserDialog *dialog)
gtk_widget_grab_default (widget);
}
/* GtkWidget::map handler */
static void
gtk_file_chooser_dialog_map (GtkWidget *widget)
{
@ -620,7 +629,6 @@ save_dialog_geometry (GtkFileChooserDialog *dialog)
g_settings_set (settings, SETTINGS_KEY_WINDOW_SIZE, "(ii)", width, height);
}
/* GtkWidget::unmap handler */
static void
gtk_file_chooser_dialog_unmap (GtkWidget *widget)
{
@ -645,9 +653,9 @@ response_cb (GtkDialog *dialog,
priv = gtk_file_chooser_dialog_get_instance_private (GTK_FILE_CHOOSER_DIALOG (dialog));
/* Act only on response IDs we recognize */
if (is_stock_accept_response_id (response_id)
&& !priv->response_requested
&& !_gtk_file_chooser_embed_should_respond (GTK_FILE_CHOOSER_EMBED (priv->widget)))
if (is_stock_accept_response_id (response_id) &&
!priv->response_requested &&
!_gtk_file_chooser_embed_should_respond (GTK_FILE_CHOOSER_EMBED (priv->widget)))
{
g_signal_stop_emission_by_name (dialog, "response");
}