#include "gtkfilechooserbutton.h"
#include "gtkprivate.h"
-#include "gtkalias.h"
/* **************** *
* Private Macros *
* **************** */
-#define GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_FILE_CHOOSER_BUTTON, GtkFileChooserButtonPrivate))
-
#define DEFAULT_TITLE N_("Select A File")
#define DESKTOP_DISPLAY_NAME N_("Desktop")
#define FALLBACK_DISPLAY_NAME N_("(None)")
file_chooser_button_signals[FILE_SET] =
g_signal_new (I_("file-set"),
G_TYPE_FROM_CLASS (gobject_class),
- G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+ G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GtkFileChooserButtonClass, file_set),
NULL, NULL,
_gtk_marshal_VOID__VOID,
GtkWidget *box, *image, *sep;
GtkTargetList *target_list;
- priv = button->priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (button);
+ priv = button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button,
+ GTK_TYPE_FILE_CHOOSER_BUTTON,
+ GtkFileChooserButtonPrivate);
priv->icon_size = FALLBACK_ICON_SIZE;
priv->focus_on_click = TRUE;
GSList *list;
char *current_folder;
- object = (*G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructor) (type,
- n_params,
- params);
+ object = G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructor (type,
+ n_params,
+ params);
button = GTK_FILE_CHOOSER_BUTTON (object);
priv = button->priv;
gtk_file_chooser_button_set_title (button, _(DEFAULT_TITLE));
}
- else if (!GTK_WINDOW (priv->dialog)->title)
+ else if (!gtk_window_get_title (GTK_WINDOW (priv->dialog)))
{
gtk_file_chooser_button_set_title (button, _(DEFAULT_TITLE));
}
g_free (current_folder);
}
- g_signal_connect (priv->dialog, "delete_event",
+ g_signal_connect (priv->dialog, "delete-event",
G_CALLBACK (dialog_delete_event_cb), object);
g_signal_connect (priv->dialog, "response",
G_CALLBACK (dialog_response_cb), object);
case GTK_FILE_CHOOSER_PROP_EXTRA_WIDGET:
case GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN:
case GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION:
+ case GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS:
g_object_set_property (G_OBJECT (priv->dialog), pspec->name, value);
break;
fs_bookmarks_changed_cb (priv->fs, button);
break;
- case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
- /* Ignore property */
- break;
-
case GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE:
g_warning ("%s: Choosers of type `%s` do not support selecting multiple files.",
G_STRFUNC, G_OBJECT_TYPE_NAME (object));
case PROP_TITLE:
case GTK_FILE_CHOOSER_PROP_ACTION:
- case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
case GTK_FILE_CHOOSER_PROP_FILTER:
case GTK_FILE_CHOOSER_PROP_LOCAL_ONLY:
case GTK_FILE_CHOOSER_PROP_PREVIEW_WIDGET:
case GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE:
case GTK_FILE_CHOOSER_PROP_SHOW_HIDDEN:
case GTK_FILE_CHOOSER_PROP_DO_OVERWRITE_CONFIRMATION:
+ case GTK_FILE_CHOOSER_PROP_CREATE_FOLDERS:
g_object_get_property (G_OBJECT (priv->dialog), pspec->name, value);
break;
{
gboolean is_folder;
- is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
+ is_folder = _gtk_file_info_consider_as_directory (info);
data->selected =
(((data->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER && is_folder) ||
if (data->selected || data->uris[++data->i] == NULL)
{
+ g_signal_emit (data->button, file_chooser_button_signals[FILE_SET], 0);
+
g_object_unref (data->button);
g_object_unref (data->file);
g_strfreev (data->uris);
gchar *text;
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received != NULL)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received) (widget,
- context,
- x, y,
- data, type,
- drag_time);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->drag_data_received (widget,
+ context,
+ x, y,
+ data, type,
+ drag_time);
if (widget == NULL || context == NULL || data == NULL || data->length < 0)
return;
NULL);
g_object_unref (file);
g_free (text);
+ g_signal_emit (button, file_chooser_button_signals[FILE_SET], 0);
break;
default:
GtkFileChooserButtonPrivate *priv = button->priv;
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->show)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->show) (widget);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->show (widget);
if (priv->active)
open_dialog (GTK_FILE_CHOOSER_BUTTON (widget));
gtk_widget_hide (priv->dialog);
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->hide)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->hide) (widget);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->hide (widget);
}
static void
priv->folder_has_been_set = TRUE;
}
- if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map) (widget);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map (widget);
}
static gboolean
gtk_file_chooser_button_style_set (GtkWidget *widget,
GtkStyle *old_style)
{
- if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set) (widget,
- old_style);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set (widget,
+ old_style);
if (gtk_widget_has_screen (widget))
change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
GdkScreen *old_screen)
{
if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->screen_changed)
- (*GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->screen_changed) (widget,
- old_screen);
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->screen_changed (widget,
+ old_screen);
- change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
+ change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));
}
if (!data->label)
data->label = g_strdup (g_file_info_get_display_name (info));
- is_folder = (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY);
+ is_folder = _gtk_file_info_consider_as_directory (info);
gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
ICON_COLUMN, pixbuf,
g_object_unref (data);
break;
case ROW_TYPE_VOLUME:
- _gtk_file_system_volume_free (data);
+ _gtk_file_system_volume_unref (data);
break;
default:
break;
GFile *base_file;
base_file = _gtk_file_system_volume_get_root (volume);
- if (base_file != NULL && !g_file_is_native (base_file))
- {
- _gtk_file_system_volume_free (volume);
- continue;
- }
+ if (base_file != NULL)
+ {
+ if (!g_file_is_native (base_file))
+ {
+ g_object_unref (base_file);
+ continue;
+ }
+ else
+ g_object_unref (base_file);
+ }
}
}
ICON_COLUMN, pixbuf,
DISPLAY_NAME_COLUMN, display_name,
TYPE_COLUMN, ROW_TYPE_VOLUME,
- DATA_COLUMN, volume,
+ DATA_COLUMN, _gtk_file_system_volume_ref (volume),
IS_FOLDER_COLUMN, TRUE,
-1);
{
if (!g_file_is_native (base_file))
retval = FALSE;
+ g_object_unref (base_file);
}
else
retval = FALSE;
label_text = NULL;
pixbuf = NULL;
+ if (priv->update_button_cancellable)
+ {
+ g_cancellable_cancel (priv->update_button_cancellable);
+ priv->update_button_cancellable = NULL;
+ }
+
if (files && files->data)
{
GFile *file;
if (base_file)
g_object_unref (base_file);
- _gtk_file_system_volume_free (volume);
+ _gtk_file_system_volume_unref (volume);
if (label_text)
goto out;
}
- if (priv->update_button_cancellable)
- {
- g_cancellable_cancel (priv->update_button_cancellable);
- priv->update_button_cancellable = NULL;
- }
-
if (g_file_is_native (file))
{
priv->update_button_cancellable =
/* Setup the dialog parent to be chooser button's toplevel, and be modal
as needed. */
- if (!GTK_WIDGET_VISIBLE (priv->dialog))
+ if (!gtk_widget_get_visible (priv->dialog))
{
GtkWidget *toplevel;
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (button));
- if (GTK_WIDGET_TOPLEVEL (toplevel) && GTK_IS_WINDOW (toplevel))
+ if (gtk_widget_is_toplevel (toplevel) && GTK_IS_WINDOW (toplevel))
{
if (GTK_WINDOW (toplevel) != gtk_window_get_transient_for (GTK_WINDOW (priv->dialog)))
gtk_window_set_transient_for (GTK_WINDOW (priv->dialog),
gtk_widget_set_sensitive (priv->combo_box, TRUE);
gtk_widget_hide (priv->dialog);
- g_signal_emit_by_name (user_data, "file-set");
+ if (response == GTK_RESPONSE_ACCEPT ||
+ response == GTK_RESPONSE_OK)
+ g_signal_emit (user_data, file_chooser_button_signals[FILE_SET], 0);
}
NULL);
}
-/**
- * gtk_file_chooser_button_new_with_backend:
- * @title: the title of the browse dialog.
- * @action: the open mode for the widget.
- * @backend: the name of the #GtkFileSystem backend to use.
- *
- * Creates a new file-selecting button widget using @backend.
- *
- * Returns: a new button widget.
- *
- * Since: 2.6
- * Deprecated: 2.14
- **/
-GtkWidget *
-gtk_file_chooser_button_new_with_backend (const gchar *title,
- GtkFileChooserAction action,
- const gchar *backend)
-{
- g_return_val_if_fail (action == GTK_FILE_CHOOSER_ACTION_OPEN ||
- action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, NULL);
-
- return g_object_new (GTK_TYPE_FILE_CHOOSER_BUTTON,
- "action", action,
- "title", (title ? title : _(DEFAULT_TITLE)),
- NULL);
-}
-
/**
* gtk_file_chooser_button_new_with_dialog:
* @dialog: the widget to use as dialog
return button->priv->focus_on_click;
}
-
-#define __GTK_FILE_CHOOSER_BUTTON_C__
-#include "gtkaliasdef.c"