* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
-#include "gtkfilechooserprivate.h"
+#include "config.h"
+
#include "gtkfilechooserdialog.h"
+
+#include "gtkfilechooserprivate.h"
#include "gtkfilechooserwidget.h"
#include "gtkfilechooserutils.h"
#include "gtkfilechooserembed.h"
#include "gtkfilesystem.h"
+#include "gtksizerequest.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h"
-#include "gtkalias.h"
#include <stdarg.h>
static void
gtk_file_chooser_dialog_init (GtkFileChooserDialog *dialog)
{
+ GtkWidget *action_area, *content_area;
GtkFileChooserDialogPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog,
GTK_TYPE_FILE_CHOOSER_DIALOG,
GtkFileChooserDialogPrivate);
dialog->priv = priv;
dialog->priv->response_requested = FALSE;
- gtk_dialog_set_has_separator (fc_dialog, FALSE);
+ content_area = gtk_dialog_get_content_area (fc_dialog);
+ action_area = gtk_dialog_get_action_area (fc_dialog);
+
gtk_container_set_border_width (GTK_CONTAINER (fc_dialog), 5);
- gtk_box_set_spacing (GTK_BOX (fc_dialog->vbox), 2); /* 2 * 5 + 2 = 12 */
- gtk_container_set_border_width (GTK_CONTAINER (fc_dialog->action_area), 5);
+ gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
+ gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
/* We do a signal connection here rather than overriding the method in
* class_init because GtkDialog::response is a RUN_LAST signal. We want *our*
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 */
static void
file_chooser_widget_file_activated (GtkFileChooser *chooser,
GtkFileChooserDialog *dialog)
{
+ GtkDialog *fc_dialog = GTK_DIALOG (dialog);
+ GtkWidget *action_area;
GList *children, *l;
if (gtk_window_activate_default (GTK_WINDOW (dialog)))
/* There probably isn't a default widget, so make things easier for the
* programmer by looking for a reasonable button on our own.
*/
-
- children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area));
+ action_area = gtk_dialog_get_action_area (fc_dialog);
+ children = gtk_container_get_children (GTK_CONTAINER (action_area));
for (l = children; l; l = l->next)
{
int response_id;
widget = GTK_WIDGET (l->data);
- response_id = gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog), widget);
- if (response_id == GTK_RESPONSE_ACCEPT
- || response_id == GTK_RESPONSE_OK
- || response_id == GTK_RESPONSE_YES
- || response_id == GTK_RESPONSE_APPLY)
+ 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
+/* FIXME: to see why this function is ifdef-ed out, see the comment below in
+ * file_chooser_widget_default_size_changed().
+ */
static void
-clamp_to_screen (GtkWidget *widget,
- gint *width,
- gint *height)
+load_position (int *out_xpos, int *out_ypos)
{
- GdkScreen *screen;
- int monitor_num;
- GdkRectangle monitor;
+ GtkFileChooserSettings *settings;
+ int x, y, width, height;
- g_return_if_fail (GTK_WIDGET_REALIZED (widget));
-
- screen = gtk_widget_get_screen (widget);
- monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
+ settings = _gtk_file_chooser_settings_new ();
+ _gtk_file_chooser_settings_get_geometry (settings, &x, &y, &width, &height);
+ g_object_unref (settings);
- gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
-
- if (width)
- *width = MIN (*width, (monitor.width * 3) / 4);
-
- if (height)
- *height = MIN (*height, (monitor.height * 3) / 4);
+ *out_xpos = x;
+ *out_ypos = y;
}
+#endif
static void
file_chooser_widget_default_size_changed (GtkWidget *widget,
GtkFileChooserDialog *dialog)
{
GtkFileChooserDialogPrivate *priv;
- gint width, height;
gint default_width, default_height;
GtkRequisition req, widget_req;
- gboolean resizable;
priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
/* Unset any previously set size */
gtk_widget_set_size_request (GTK_WIDGET (dialog), -1, -1);
- if (GTK_WIDGET_DRAWABLE (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_size_request (GTK_WIDGET (dialog), &req);
- gtk_widget_size_request (widget, &widget_req);
-
- width = req.width - widget_req.width;
- height = req.height - widget_req.height;
- }
- else
- {
- width = GTK_WIDGET (dialog)->allocation.width - widget->allocation.width;
- height = GTK_WIDGET (dialog)->allocation.height - widget->allocation.height;
+ gtk_widget_get_preferred_size (GTK_WIDGET (dialog),
+ &req, NULL);
+ gtk_widget_get_preferred_size (widget,
+ &widget_req, NULL);
}
- resizable = _gtk_file_chooser_embed_get_resizable (GTK_FILE_CHOOSER_EMBED (priv->widget));
_gtk_file_chooser_embed_get_default_size (GTK_FILE_CHOOSER_EMBED (priv->widget),
&default_width, &default_height);
- /* Ideal target size plus any extra size */
- width = default_width + width + (2 * GTK_CONTAINER (dialog)->border_width);
- height = default_height + height + (2 * GTK_CONTAINER (dialog)->border_width);
-
- if (GTK_WIDGET_REALIZED (dialog))
- clamp_to_screen (GTK_WIDGET (dialog), &width, &height);
+ gtk_window_resize (GTK_WINDOW (dialog), default_width, default_height);
- if (resizable)
- {
- gtk_window_set_resizable (GTK_WINDOW (dialog), resizable);
- gtk_window_resize (GTK_WINDOW (dialog), width, height);
- }
- else
+ if (!gtk_widget_get_mapped (GTK_WIDGET (dialog)))
{
- gtk_widget_set_size_request (GTK_WIDGET (dialog), width, -1);
- gtk_window_set_resizable (GTK_WINDOW (dialog), resizable);
+#if 0
+ /* FIXME: the code to restore the position does not work yet. It is not
+ * clear whether it is actually desirable --- if enabled, applications
+ * would not be able to say "center the file chooser on top of my toplevel
+ * window". So, we don't use this code at all.
+ */
+ load_position (&xpos, &ypos);
+ if (xpos >= 0 && ypos >= 0)
+ {
+ gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_NONE);
+ gtk_window_move (GTK_WINDOW (dialog), xpos, ypos);
+ }
+#endif
}
}
file_chooser_widget_response_requested (GtkWidget *widget,
GtkFileChooserDialog *dialog)
{
+ GtkDialog *fc_dialog = GTK_DIALOG (dialog);
+ GtkWidget *action_area;
GList *children, *l;
+ dialog->priv->response_requested = TRUE;
+
+ if (gtk_window_activate_default (GTK_WINDOW (dialog)))
+ return;
+
/* There probably isn't a default widget, so make things easier for the
* programmer by looking for a reasonable button on our own.
*/
-
- children = gtk_container_get_children (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area));
+ action_area = gtk_dialog_get_action_area (fc_dialog);
+ children = gtk_container_get_children (GTK_CONTAINER (action_area));
for (l = children; l; l = l->next)
{
int response_id;
widget = GTK_WIDGET (l->data);
- response_id = gtk_dialog_get_response_for_widget (GTK_DIALOG (dialog), widget);
- if (response_id == GTK_RESPONSE_ACCEPT
- || response_id == GTK_RESPONSE_OK
- || response_id == GTK_RESPONSE_YES
- || response_id == GTK_RESPONSE_APPLY)
+ response_id = gtk_dialog_get_response_for_widget (fc_dialog, widget);
+ if (gtk_widget_is_sensitive (widget) &&
+ is_stock_accept_response_id (response_id))
{
- dialog->priv->response_requested = TRUE;
gtk_widget_activate (widget); /* Should we gtk_dialog_response (dialog, response_id) instead? */
break;
}
}
+ if (l == NULL)
+ dialog->priv->response_requested = FALSE;
+
g_list_free (children);
}
GObjectConstructParam *construct_params)
{
GtkFileChooserDialogPrivate *priv;
+ GtkWidget *content_area;
GObject *object;
object = G_OBJECT_CLASS (gtk_file_chooser_dialog_parent_class)->constructor (type,
if (priv->file_system)
priv->widget = g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET,
- "file-system-backend", priv->file_system,
NULL);
else
priv->widget = g_object_new (GTK_TYPE_FILE_CHOOSER_WIDGET, NULL);
g_signal_connect (priv->widget, "response-requested",
G_CALLBACK (file_chooser_widget_response_requested), object);
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (object));
+
gtk_container_set_border_width (GTK_CONTAINER (priv->widget), 5);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (object)->vbox), priv->widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), priv->widget, TRUE, TRUE, 0);
gtk_widget_show (priv->widget);
switch (prop_id)
{
- case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
- g_free (priv->file_system);
- priv->file_system = g_value_dup_string (value);
- break;
default:
g_object_set_property (G_OBJECT (priv->widget), pspec->name, value);
break;
g_object_get_property (G_OBJECT (priv->widget), pspec->name, value);
}
-#if 0
static void
-set_default_size (GtkFileChooserDialog *dialog)
+foreach_ensure_default_response_cb (GtkWidget *widget,
+ gpointer data)
{
- GtkWidget *widget;
- GtkWindow *window;
- int default_width, default_height;
- int width, height;
- int font_size;
- GdkScreen *screen;
- int monitor_num;
- GtkRequisition req;
- GdkRectangle monitor;
-
- widget = GTK_WIDGET (dialog);
- window = GTK_WINDOW (dialog);
-
- /* Size based on characters */
-
- font_size = pango_font_description_get_size (widget->style->font_desc);
- font_size = PANGO_PIXELS (font_size);
-
- width = font_size * NUM_CHARS;
- height = font_size * NUM_LINES;
-
- /* Use at least the requisition size... */
-
- gtk_widget_size_request (widget, &req);
- width = MAX (width, req.width);
- height = MAX (height, req.height);
-
- /* ... but no larger than the monitor */
-
- screen = gtk_widget_get_screen (widget);
- monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window);
-
- gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
-
- width = MIN (width, monitor.width * 3 / 4);
- height = MIN (height, monitor.height * 3 / 4);
+ GtkFileChooserDialog *dialog = GTK_FILE_CHOOSER_DIALOG (data);
+ int response_id;
- /* Set size */
+ 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);
+}
- gtk_window_get_default_size (window, &default_width, &default_height);
+static void
+ensure_default_response (GtkFileChooserDialog *dialog)
+{
+ GtkWidget *action_area;
- gtk_window_set_default_size (window,
- (default_width == -1) ? width : default_width,
- (default_height == -1) ? height : default_height);
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+ gtk_container_foreach (GTK_CONTAINER (action_area),
+ foreach_ensure_default_response_cb,
+ dialog);
}
-#endif
/* GtkWidget::map handler */
static void
GtkFileChooserDialog *dialog = GTK_FILE_CHOOSER_DIALOG (widget);
GtkFileChooserDialogPrivate *priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
- if (!GTK_WIDGET_MAPPED (priv->widget))
+ ensure_default_response (dialog);
+
+ if (!gtk_widget_get_mapped (priv->widget))
gtk_widget_map (priv->widget);
- file_chooser_widget_default_size_changed (priv->widget, dialog);
_gtk_file_chooser_embed_initial_focus (GTK_FILE_CHOOSER_EMBED (priv->widget));
GTK_WIDGET_CLASS (gtk_file_chooser_dialog_parent_class)->map (widget);
priv = GTK_FILE_CHOOSER_DIALOG_GET_PRIVATE (dialog);
/* Act only on response IDs we recognize */
- if (!(response_id == GTK_RESPONSE_ACCEPT
- || response_id == GTK_RESPONSE_OK
- || response_id == GTK_RESPONSE_YES
- || response_id == GTK_RESPONSE_APPLY))
- return;
-
- if (!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");
- priv->response_requested = FALSE;
}
+
+ priv->response_requested = FALSE;
}
static GtkWidget *
gtk_file_chooser_dialog_new_valist (const gchar *title,
GtkWindow *parent,
GtkFileChooserAction action,
- const gchar *backend,
const gchar *first_button_text,
va_list varargs)
{
result = g_object_new (GTK_TYPE_FILE_CHOOSER_DIALOG,
"title", title,
"action", action,
- "file-system-backend", backend,
NULL);
if (parent)
/**
* gtk_file_chooser_dialog_new:
- * @title: Title of the dialog, or %NULL
- * @parent: Transient parent of the dialog, or %NULL
+ * @title: (allow-none): Title of the dialog, or %NULL
+ * @parent: (allow-none): Transient parent of the dialog, or %NULL
* @action: Open or save mode for the dialog
- * @first_button_text: stock ID or text to go in the first button, or %NULL
+ * @first_button_text: (allow-none): stock ID or text to go in the first button, or %NULL
* @Varargs: response ID for the first button, then additional (button, id) pairs, ending with %NULL
*
* Creates a new #GtkFileChooserDialog. This function is analogous to
va_start (varargs, first_button_text);
result = gtk_file_chooser_dialog_new_valist (title, parent, action,
- NULL, first_button_text,
- varargs);
- va_end (varargs);
-
- return result;
-}
-
-/**
- * gtk_file_chooser_dialog_new_with_backend:
- * @title: Title of the dialog, or %NULL
- * @parent: Transient parent of the dialog, or %NULL
- * @action: Open or save mode for the dialog
- * @backend: The name of the specific filesystem backend to use.
- * @first_button_text: stock ID or text to go in the first button, or %NULL
- * @Varargs: response ID for the first button, then additional (button, id) pairs, ending with %NULL
- *
- * Creates a new #GtkFileChooserDialog with a specified backend. This is
- * especially useful if you use gtk_file_chooser_set_local_only() to allow
- * non-local files and you use a more expressive vfs, such as gnome-vfs,
- * to load files.
- *
- * Return value: a new #GtkFileChooserDialog
- *
- * Since: 2.4
- **/
-GtkWidget *
-gtk_file_chooser_dialog_new_with_backend (const gchar *title,
- GtkWindow *parent,
- GtkFileChooserAction action,
- const gchar *backend,
- const gchar *first_button_text,
- ...)
-{
- GtkWidget *result;
- va_list varargs;
-
- va_start (varargs, first_button_text);
- result = gtk_file_chooser_dialog_new_valist (title, parent, action,
- backend, first_button_text,
+ first_button_text,
varargs);
va_end (varargs);
return result;
}
-
-#define __GTK_FILE_CHOOSER_DIALOG_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff