* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
+#include "config.h"
#include <sys/types.h>
#include <sys/stat.h>
#include "gtkfilechooserdialog.h"
#include "gtkfilechooserprivate.h"
#include "gtkfilechooserutils.h"
+#include "gtkmarshalers.h"
#include "gtkfilechooserbutton.h"
-#ifdef G_OS_WIN32
-#include "gtkfilesystemwin32.h"
-#endif
-
#include "gtkprivate.h"
#include "gtkalias.h"
* Private Macros *
* **************** */
-#define GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE(object) (GTK_FILE_CHOOSER_BUTTON ((object))->priv)
+#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 HOME_DISPLAY_NAME N_("Home")
#define DESKTOP_DISPLAY_NAME N_("Desktop")
#define FALLBACK_DISPLAY_NAME N_("(None)")
#define FALLBACK_ICON_NAME "stock_unknown"
PROP_0,
PROP_DIALOG,
+ PROP_FOCUS_ON_CLICK,
PROP_TITLE,
PROP_WIDTH_CHARS
};
+/* Signals */
+enum
+{
+ FILE_SET,
+ LAST_SIGNAL
+};
+
/* TreeModel Columns */
enum
{
DISPLAY_NAME_COLUMN,
TYPE_COLUMN,
DATA_COLUMN,
+ IS_FOLDER_COLUMN,
+ CANCELLABLE_COLUMN,
NUM_COLUMNS
};
GtkTreeModel *model;
GtkTreeModel *filter_model;
- gchar *backend;
GtkFileSystem *fs;
- GtkFilePath *old_path;
+ GFile *old_file;
gulong combo_box_changed_id;
gulong dialog_file_activated_id;
gulong fs_volumes_changed_id;
gulong fs_bookmarks_changed_id;
+ GCancellable *dnd_select_folder_cancellable;
+ GCancellable *update_button_cancellable;
+ GSList *change_icon_theme_cancellables;
+
gint icon_size;
guint8 n_special;
guint8 n_volumes;
guint8 n_shortcuts;
guint8 n_bookmarks;
- guint8 has_bookmark_separator : 1;
- guint8 has_current_folder_separator : 1;
- guint8 has_current_folder : 1;
- guint8 has_other_separator : 1;
+ guint has_bookmark_separator : 1;
+ guint has_current_folder_separator : 1;
+ guint has_current_folder : 1;
+ guint has_other_separator : 1;
/* Used for hiding/showing the dialog when the button is hidden */
- guint8 active : 1;
+ guint active : 1;
+
+ /* Used to track whether we need to set a default current folder on ::map() */
+ guint folder_has_been_set : 1;
+
+ guint focus_on_click : 1;
};
/* GtkFileChooserIface Functions */
static void gtk_file_chooser_button_file_chooser_iface_init (GtkFileChooserIface *iface);
static gboolean gtk_file_chooser_button_add_shortcut_folder (GtkFileChooser *chooser,
- const GtkFilePath *path,
+ GFile *file,
GError **error);
static gboolean gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser *chooser,
- const GtkFilePath *path,
+ GFile *file,
GError **error);
/* GObject Functions */
gint x,
gint y,
GtkSelectionData *data,
- guint info,
+ guint type,
guint drag_time);
static void gtk_file_chooser_button_show_all (GtkWidget *widget);
static void gtk_file_chooser_button_hide_all (GtkWidget *widget);
static void gtk_file_chooser_button_show (GtkWidget *widget);
static void gtk_file_chooser_button_hide (GtkWidget *widget);
+static void gtk_file_chooser_button_map (GtkWidget *widget);
static gboolean gtk_file_chooser_button_mnemonic_activate (GtkWidget *widget,
gboolean group_cycling);
static void gtk_file_chooser_button_style_set (GtkWidget *widget,
/* Utility Functions */
static GtkIconTheme *get_icon_theme (GtkWidget *widget);
-static gchar *get_display_name_for_path (GtkFileSystem *fs,
- const GtkFilePath *path);
+static void set_info_for_file_at_iter (GtkFileChooserButton *fs,
+ GFile *file,
+ GtkTreeIter *iter);
static gint model_get_type_position (GtkFileChooserButton *button,
RowType row_type);
static void model_add_bookmarks (GtkFileChooserButton *button,
GSList *bookmarks);
static void model_update_current_folder (GtkFileChooserButton *button,
- const GtkFilePath *path);
+ GFile *file);
static void model_remove_rows (GtkFileChooserButton *button,
gint pos,
gint n_rows);
gint response,
gpointer user_data);
+static guint file_chooser_button_signals[LAST_SIGNAL] = { 0 };
/* ******************* *
* GType Declaration *
G_DEFINE_TYPE_WITH_CODE (GtkFileChooserButton, gtk_file_chooser_button, GTK_TYPE_HBOX, { \
G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER, gtk_file_chooser_button_file_chooser_iface_init) \
-});
+})
/* ***************** *
widget_class->hide_all = gtk_file_chooser_button_hide_all;
widget_class->show = gtk_file_chooser_button_show;
widget_class->hide = gtk_file_chooser_button_hide;
+ widget_class->map = gtk_file_chooser_button_map;
widget_class->style_set = gtk_file_chooser_button_style_set;
widget_class->screen_changed = gtk_file_chooser_button_screen_changed;
widget_class->mnemonic_activate = gtk_file_chooser_button_mnemonic_activate;
+ /**
+ * GtkFileChooserButton::file-set:
+ * @widget: the object which received the signal.
+ *
+ * The ::file-set signal is emitted when the user selects a file.
+ *
+ * Note that this signal is only emitted when the <emphasis>user</emphasis>
+ * changes the file.
+ *
+ * Since: 2.12
+ */
+ file_chooser_button_signals[FILE_SET] =
+ g_signal_new (I_("file-set"),
+ G_TYPE_FROM_CLASS (gobject_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkFileChooserButtonClass, file_set),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+
/**
* GtkFileChooserButton:dialog:
*
g_param_spec_object ("dialog",
P_("Dialog"),
P_("The file chooser dialog to use."),
- GTK_TYPE_FILE_CHOOSER_DIALOG,
+ GTK_TYPE_FILE_CHOOSER,
(GTK_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY)));
+ /**
+ * GtkFileChooserButton:focus-on-click:
+ *
+ * Whether the #GtkFileChooserButton button grabs focus when it is clicked
+ * with the mouse.
+ *
+ * Since: 2.10
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_FOCUS_ON_CLICK,
+ g_param_spec_boolean ("focus-on-click",
+ P_("Focus on click"),
+ P_("Whether the button grabs focus when it is clicked with the mouse"),
+ TRUE,
+ GTK_PARAM_READWRITE));
+
/**
* GtkFileChooserButton:title:
*
GtkWidget *box, *image, *sep;
GtkTargetList *target_list;
- priv = G_TYPE_INSTANCE_GET_PRIVATE (button, GTK_TYPE_FILE_CHOOSER_BUTTON,
- GtkFileChooserButtonPrivate);
- button->priv = priv;
+ priv = button->priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (button);
priv->icon_size = FALLBACK_ICON_SIZE;
+ priv->focus_on_click = TRUE;
gtk_widget_push_composite_child ();
GDK_TYPE_PIXBUF, /* Icon */
G_TYPE_STRING, /* Display Name */
G_TYPE_CHAR, /* Row Type */
- G_TYPE_POINTER /* Volume || Path */));
+ G_TYPE_POINTER /* Volume || Path */,
+ G_TYPE_BOOLEAN /* Is Folder? */,
+ G_TYPE_POINTER /* cancellable */));
priv->combo_box = gtk_combo_box_new ();
priv->combo_box_changed_id =
}
static gboolean
-gtk_file_chooser_button_add_shortcut_folder (GtkFileChooser *chooser,
- const GtkFilePath *path,
- GError **error)
+gtk_file_chooser_button_add_shortcut_folder (GtkFileChooser *chooser,
+ GFile *file,
+ GError **error)
{
GtkFileChooser *delegate;
gboolean retval;
delegate = g_object_get_qdata (G_OBJECT (chooser),
GTK_FILE_CHOOSER_DELEGATE_QUARK);
- retval = _gtk_file_chooser_add_shortcut_folder (delegate, path, error);
+ retval = _gtk_file_chooser_add_shortcut_folder (delegate, file, error);
if (retval)
{
- GtkFileChooserButtonPrivate *priv;
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (chooser);
+ GtkFileChooserButtonPrivate *priv = button->priv;
GtkTreeIter iter;
gint pos;
- GdkPixbuf *pixbuf;
- gchar *display_name;
-
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (chooser);
- pos = model_get_type_position (GTK_FILE_CHOOSER_BUTTON (chooser),
- ROW_TYPE_SHORTCUT);
+ pos = model_get_type_position (button, ROW_TYPE_SHORTCUT);
pos += priv->n_shortcuts;
- pixbuf = gtk_file_system_render_icon (priv->fs, path,
- GTK_WIDGET (chooser),
- priv->icon_size, NULL);
- display_name = get_display_name_for_path (priv->fs, path);
-
gtk_list_store_insert (GTK_LIST_STORE (priv->model), &iter, pos);
gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter,
- ICON_COLUMN, pixbuf,
- DISPLAY_NAME_COLUMN, display_name,
+ ICON_COLUMN, NULL,
+ DISPLAY_NAME_COLUMN, _(FALLBACK_DISPLAY_NAME),
TYPE_COLUMN, ROW_TYPE_SHORTCUT,
- DATA_COLUMN, gtk_file_path_copy (path),
+ DATA_COLUMN, g_object_ref (file),
+ IS_FOLDER_COLUMN, FALSE,
-1);
+ set_info_for_file_at_iter (button, file, &iter);
priv->n_shortcuts++;
- if (pixbuf)
- g_object_unref (pixbuf);
- g_free (display_name);
-
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->filter_model));
}
}
static gboolean
-gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser *chooser,
- const GtkFilePath *path,
- GError **error)
+gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser *chooser,
+ GFile *file,
+ GError **error)
{
GtkFileChooser *delegate;
gboolean retval;
delegate = g_object_get_qdata (G_OBJECT (chooser),
GTK_FILE_CHOOSER_DELEGATE_QUARK);
- retval = _gtk_file_chooser_remove_shortcut_folder (delegate, path, error);
+ retval = _gtk_file_chooser_remove_shortcut_folder (delegate, file, error);
if (retval)
{
- GtkFileChooserButtonPrivate *priv;
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (chooser);
+ GtkFileChooserButtonPrivate *priv = button->priv;
GtkTreeIter iter;
gint pos;
gchar type;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (chooser);
-
- pos = model_get_type_position (GTK_FILE_CHOOSER_BUTTON (chooser),
- ROW_TYPE_SHORTCUT);
- g_assert (gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos));
+ pos = model_get_type_position (button, ROW_TYPE_SHORTCUT);
+ gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos);
do
{
-1);
if (type == ROW_TYPE_SHORTCUT &&
- data &&
- gtk_file_path_compare (data, path) == 0)
+ data && g_file_equal (data, file))
{
model_free_row_data (GTK_FILE_CHOOSER_BUTTON (chooser), &iter);
gtk_list_store_remove (GTK_LIST_STORE (priv->model), &iter);
GObjectConstructParam *params)
{
GObject *object;
+ GtkFileChooserButton *button;
GtkFileChooserButtonPrivate *priv;
GSList *list;
+ char *current_folder;
- object = (*G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructor) (type,
- n_params,
- params);
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (object);
+ object = G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->constructor (type,
+ n_params,
+ params);
+ button = GTK_FILE_CHOOSER_BUTTON (object);
+ priv = button->priv;
if (!priv->dialog)
{
- if (priv->backend)
- priv->dialog = gtk_file_chooser_dialog_new_with_backend (NULL, NULL,
- GTK_FILE_CHOOSER_ACTION_OPEN,
- priv->backend,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN,
- GTK_RESPONSE_ACCEPT,
- NULL);
- else
- priv->dialog = gtk_file_chooser_dialog_new (NULL, NULL,
- GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN,
- GTK_RESPONSE_ACCEPT,
- NULL);
+ priv->dialog = gtk_file_chooser_dialog_new (NULL, NULL,
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN,
+ GTK_RESPONSE_ACCEPT,
+ NULL);
gtk_dialog_set_default_response (GTK_DIALOG (priv->dialog),
GTK_RESPONSE_ACCEPT);
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
+
+ gtk_file_chooser_button_set_title (button, _(DEFAULT_TITLE));
+ }
+ else if (!GTK_WINDOW (priv->dialog)->title)
+ {
+ gtk_file_chooser_button_set_title (button, _(DEFAULT_TITLE));
}
- g_free (priv->backend);
- priv->backend = NULL;
+ current_folder = gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (priv->dialog));
+ if (current_folder != NULL)
+ {
+ priv->folder_has_been_set = TRUE;
+ g_free (current_folder);
+ }
g_signal_connect (priv->dialog, "delete-event",
G_CALLBACK (dialog_delete_event_cb), object);
g_signal_connect (priv->dialog, "notify",
G_CALLBACK (dialog_notify_cb), object);
g_object_add_weak_pointer (G_OBJECT (priv->dialog),
- (gpointer *) (&priv->dialog));
+ (gpointer) (&priv->dialog));
priv->fs =
g_object_ref (_gtk_file_chooser_get_file_system (GTK_FILE_CHOOSER (priv->dialog)));
- model_add_special (GTK_FILE_CHOOSER_BUTTON (object));
+ model_add_special (button);
- list = gtk_file_system_list_volumes (priv->fs);
- model_add_volumes (GTK_FILE_CHOOSER_BUTTON (object), list);
+ list = _gtk_file_system_list_volumes (priv->fs);
+ model_add_volumes (button, list);
g_slist_free (list);
- list = gtk_file_system_list_bookmarks (priv->fs);
- model_add_bookmarks (GTK_FILE_CHOOSER_BUTTON (object), list);
- gtk_file_paths_free (list);
+ list = _gtk_file_system_list_bookmarks (priv->fs);
+ model_add_bookmarks (button, list);
+ g_slist_foreach (list, (GFunc) g_object_unref, NULL);
+ g_slist_free (list);
- model_add_other (GTK_FILE_CHOOSER_BUTTON (object));
+ model_add_other (button);
priv->filter_model = gtk_tree_model_filter_new (priv->model, NULL);
gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (priv->filter_model),
const GValue *value,
GParamSpec *pspec)
{
- GtkFileChooserButtonPrivate *priv;
-
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (object);
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (object);
+ GtkFileChooserButtonPrivate *priv = button->priv;
switch (param_id)
{
/* Construct-only */
priv->dialog = g_value_get_object (value);
break;
+ case PROP_FOCUS_ON_CLICK:
+ gtk_file_chooser_button_set_focus_on_click (button, g_value_get_boolean (value));
+ break;
case PROP_WIDTH_CHARS:
gtk_file_chooser_button_set_width_chars (GTK_FILE_CHOOSER_BUTTON (object),
g_value_get_int (value));
case PROP_TITLE:
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_PREVIEW_WIDGET_ACTIVE:
case GTK_FILE_CHOOSER_PROP_USE_PREVIEW_LABEL:
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;
+ case GTK_FILE_CHOOSER_PROP_LOCAL_ONLY:
+ g_object_set_property (G_OBJECT (priv->dialog), pspec->name, value);
+ fs_volumes_changed_cb (priv->fs, button);
+ fs_bookmarks_changed_cb (priv->fs, button);
+ break;
+
case GTK_FILE_CHOOSER_PROP_FILE_SYSTEM_BACKEND:
- /* Construct-only */
- priv->backend = g_value_dup_string (value);
+ /* Ignore property */
break;
case GTK_FILE_CHOOSER_PROP_SELECT_MULTIPLE:
GValue *value,
GParamSpec *pspec)
{
- GtkFileChooserButtonPrivate *priv;
-
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (object);
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (object);
+ GtkFileChooserButtonPrivate *priv = button->priv;
switch (param_id)
{
g_value_set_int (value,
gtk_label_get_width_chars (GTK_LABEL (priv->label)));
break;
+ case PROP_FOCUS_ON_CLICK:
+ g_value_set_boolean (value,
+ gtk_file_chooser_button_get_focus_on_click (button));
+ break;
case PROP_TITLE:
case GTK_FILE_CHOOSER_PROP_ACTION:
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;
static void
gtk_file_chooser_button_finalize (GObject *object)
{
- GtkFileChooserButtonPrivate *priv;
- GtkTreeIter iter;
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (object);
+ GtkFileChooserButtonPrivate *priv = button->priv;
+
+ if (priv->old_file)
+ g_object_unref (priv->old_file);
+
+ G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize (object);
+}
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (object);
+/* ********************* *
+ * GtkObject Functions *
+ * ********************* */
- if (priv->old_path)
- gtk_file_path_free (priv->old_path);
+static void
+gtk_file_chooser_button_destroy (GtkObject *object)
+{
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (object);
+ GtkFileChooserButtonPrivate *priv = button->priv;
+ GtkTreeIter iter;
+ GSList *l;
- g_assert (gtk_tree_model_get_iter_first (priv->model, &iter));
+ if (priv->dialog != NULL)
+ {
+ gtk_widget_destroy (priv->dialog);
+ priv->dialog = NULL;
+ }
- do
+ if (priv->model && gtk_tree_model_get_iter_first (priv->model, &iter)) do
{
- model_free_row_data (GTK_FILE_CHOOSER_BUTTON (object), &iter);
+ model_free_row_data (button, &iter);
}
while (gtk_tree_model_iter_next (priv->model, &iter));
- g_object_unref (priv->model);
- g_object_unref (priv->filter_model);
+ if (priv->dnd_select_folder_cancellable)
+ {
+ g_cancellable_cancel (priv->dnd_select_folder_cancellable);
+ priv->dnd_select_folder_cancellable = NULL;
+ }
+
+ if (priv->update_button_cancellable)
+ {
+ g_cancellable_cancel (priv->update_button_cancellable);
+ priv->update_button_cancellable = NULL;
+ }
+
+ if (priv->change_icon_theme_cancellables)
+ {
+ for (l = priv->change_icon_theme_cancellables; l; l = l->next)
+ {
+ GCancellable *cancellable = G_CANCELLABLE (l->data);
+ g_cancellable_cancel (cancellable);
+ }
+ g_slist_free (priv->change_icon_theme_cancellables);
+ priv->change_icon_theme_cancellables = NULL;
+ }
+
+ if (priv->model)
+ {
+ g_object_unref (priv->model);
+ priv->model = NULL;
+ }
+
+ if (priv->filter_model)
+ {
+ g_object_unref (priv->filter_model);
+ priv->filter_model = NULL;
+ }
- g_signal_handler_disconnect (priv->fs, priv->fs_volumes_changed_id);
- g_signal_handler_disconnect (priv->fs, priv->fs_bookmarks_changed_id);
- g_object_unref (priv->fs);
+ if (priv->fs)
+ {
+ g_signal_handler_disconnect (priv->fs, priv->fs_volumes_changed_id);
+ g_signal_handler_disconnect (priv->fs, priv->fs_bookmarks_changed_id);
+ g_object_unref (priv->fs);
+ priv->fs = NULL;
+ }
- if (G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize != NULL)
- (*G_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->finalize) (object);
+ GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy (object);
}
+
/* ********************* *
- * GtkObject Functions *
+ * GtkWidget Functions *
* ********************* */
+struct DndSelectFolderData
+{
+ GtkFileSystem *file_system;
+ GtkFileChooserButton *button;
+ GtkFileChooserAction action;
+ GFile *file;
+ gchar **uris;
+ guint i;
+ gboolean selected;
+};
+
static void
-gtk_file_chooser_button_destroy (GtkObject *object)
+dnd_select_folder_get_info_cb (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer user_data)
{
- GtkFileChooserButtonPrivate *priv;
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
+ struct DndSelectFolderData *data = user_data;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (object);
+ if (cancellable != data->button->priv->dnd_select_folder_cancellable)
+ {
+ g_object_unref (data->button);
+ g_object_unref (data->file);
+ g_strfreev (data->uris);
+ g_free (data);
- if (priv->dialog != NULL)
- gtk_widget_destroy (priv->dialog);
+ g_object_unref (cancellable);
+ return;
+ }
- if (GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy != NULL)
- (*GTK_OBJECT_CLASS (gtk_file_chooser_button_parent_class)->destroy) (object);
-}
+ data->button->priv->dnd_select_folder_cancellable = NULL;
+ if (!cancelled && !error && info != NULL)
+ {
+ gboolean is_folder;
-/* ********************* *
- * GtkWidget Functions *
- * ********************* */
+ is_folder = _gtk_file_info_consider_as_directory (info);
+
+ data->selected =
+ (((data->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER && is_folder) ||
+ (data->action == GTK_FILE_CHOOSER_ACTION_OPEN && !is_folder)) &&
+ gtk_file_chooser_select_file (GTK_FILE_CHOOSER (data->button->priv->dialog),
+ data->file, NULL));
+ }
+ else
+ data->selected = FALSE;
+
+ 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);
+ g_free (data);
+
+ g_object_unref (cancellable);
+ return;
+ }
+
+ if (data->file)
+ g_object_unref (data->file);
+
+ data->file = g_file_new_for_uri (data->uris[data->i]);
+
+ data->button->priv->dnd_select_folder_cancellable =
+ _gtk_file_system_get_info (data->file_system, data->file,
+ "standard::type",
+ dnd_select_folder_get_info_cb, user_data);
+
+ g_object_unref (cancellable);
+}
static void
gtk_file_chooser_button_drag_data_received (GtkWidget *widget,
gint x,
gint y,
GtkSelectionData *data,
- guint info,
+ guint type,
guint drag_time)
{
- GtkFileChooserButtonPrivate *priv;
- GtkFilePath *path;
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (widget);
+ GtkFileChooserButtonPrivate *priv = button->priv;
+ GFile *file;
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, info,
- 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;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (widget);
-
- switch (info)
+ switch (type)
{
case TEXT_URI_LIST:
{
gchar **uris;
- GtkFilePath *base_path;
- guint i;
- gboolean selected;
+ struct DndSelectFolderData *info;
uris = gtk_selection_data_get_uris (data);
if (uris == NULL)
break;
- selected = FALSE;
- for (i = 0; !selected && uris[i] != NULL; i++)
- {
- path = gtk_file_system_uri_to_path (priv->fs, uris[i]);
-
- base_path = NULL;
- if (path != NULL &&
- gtk_file_system_get_parent (priv->fs, path, &base_path, NULL))
- {
- GtkFileFolder *folder;
- GtkFileInfo *info;
-
- folder = gtk_file_system_get_folder (priv->fs, base_path,
- GTK_FILE_INFO_IS_FOLDER,
- NULL);
-
- info = gtk_file_folder_get_info (folder, path, NULL);
-
- if (info != NULL)
- {
- GtkFileChooserAction action;
-
- g_object_get (priv->dialog, "action", &action, NULL);
+ info = g_new0 (struct DndSelectFolderData, 1);
+ info->button = g_object_ref (button);
+ info->i = 0;
+ info->uris = uris;
+ info->selected = FALSE;
+ info->file_system = priv->fs;
+ g_object_get (priv->dialog, "action", &info->action, NULL);
- selected =
- (((action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER &&
- gtk_file_info_get_is_folder (info)) ||
- (action == GTK_FILE_CHOOSER_ACTION_OPEN &&
- !gtk_file_info_get_is_folder (info))) &&
- _gtk_file_chooser_select_path (GTK_FILE_CHOOSER (priv->dialog),
- path, NULL));
+ info->file = g_file_new_for_uri (info->uris[info->i]);
- gtk_file_info_free (info);
- }
- else
- selected = FALSE;
-
- gtk_file_path_free (base_path);
- }
+ if (priv->dnd_select_folder_cancellable)
+ g_cancellable_cancel (priv->dnd_select_folder_cancellable);
- gtk_file_path_free (path);
- }
-
- g_strfreev (uris);
+ priv->dnd_select_folder_cancellable =
+ _gtk_file_system_get_info (priv->fs, info->file,
+ "standard::type",
+ dnd_select_folder_get_info_cb, info);
}
break;
case TEXT_PLAIN:
- text = gtk_selection_data_get_text (data);
- path = gtk_file_path_new_steal (text);
- _gtk_file_chooser_select_path (GTK_FILE_CHOOSER (priv->dialog), path,
- NULL);
- gtk_file_path_free (path);
+ text = (char*) gtk_selection_data_get_text (data);
+ file = g_file_new_for_uri (text);
+ gtk_file_chooser_select_file (GTK_FILE_CHOOSER (priv->dialog), file,
+ NULL);
+ g_object_unref (file);
+ g_free (text);
+ g_signal_emit (button, file_chooser_button_signals[FILE_SET], 0);
break;
default:
static void
gtk_file_chooser_button_show (GtkWidget *widget)
{
- GtkFileChooserButtonPrivate *priv;
-
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (widget);
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (widget);
+ 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));
static void
gtk_file_chooser_button_hide (GtkWidget *widget)
{
- GtkFileChooserButtonPrivate *priv;
-
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (widget);
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (widget);
+ GtkFileChooserButtonPrivate *priv = button->priv;
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
+gtk_file_chooser_button_map (GtkWidget *widget)
+{
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (widget);
+ GtkFileChooserButtonPrivate *priv = button->priv;
+
+ if (!priv->folder_has_been_set)
+ {
+ char *current_working_dir;
+
+ current_working_dir = g_get_current_dir ();
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), current_working_dir);
+ g_free (current_working_dir);
+
+ priv->folder_has_been_set = TRUE;
+ }
+
+ GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map (widget);
}
static gboolean
gtk_file_chooser_button_mnemonic_activate (GtkWidget *widget,
gboolean group_cycling)
{
- GtkFileChooserButtonPrivate *priv;
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (widget);
+ GtkFileChooserButtonPrivate *priv = button->priv;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (widget);
switch (gtk_file_chooser_get_action (GTK_FILE_CHOOSER (priv->dialog)))
{
case GTK_FILE_CHOOSER_ACTION_OPEN:
}
/* Changes the icons wherever it is needed */
+struct ChangeIconThemeData
+{
+ GtkFileChooserButton *button;
+ GtkTreeRowReference *row_ref;
+};
+
+static void
+change_icon_theme_get_info_cb (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer user_data)
+{
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
+ GdkPixbuf *pixbuf;
+ struct ChangeIconThemeData *data = user_data;
+
+ if (!g_slist_find (data->button->priv->change_icon_theme_cancellables, cancellable))
+ goto out;
+
+ data->button->priv->change_icon_theme_cancellables =
+ g_slist_remove (data->button->priv->change_icon_theme_cancellables, cancellable);
+
+ if (cancelled || error)
+ goto out;
+
+ pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
+
+ if (pixbuf)
+ {
+ gint width = 0;
+ GtkTreeIter iter;
+ GtkTreePath *path;
+
+ width = MAX (width, gdk_pixbuf_get_width (pixbuf));
+
+ path = gtk_tree_row_reference_get_path (data->row_ref);
+ if (path)
+ {
+ gtk_tree_model_get_iter (data->button->priv->model, &iter, path);
+ gtk_tree_path_free (path);
+
+ gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
+ ICON_COLUMN, pixbuf,
+ -1);
+
+ g_object_set (data->button->priv->icon_cell,
+ "width", width,
+ NULL);
+ }
+ g_object_unref (pixbuf);
+ }
+
+out:
+ g_object_unref (data->button);
+ gtk_tree_row_reference_free (data->row_ref);
+ g_free (data);
+
+ g_object_unref (cancellable);
+}
+
static void
change_icon_theme (GtkFileChooserButton *button)
{
- GtkFileChooserButtonPrivate *priv;
+ GtkFileChooserButtonPrivate *priv = button->priv;
GtkSettings *settings;
GtkIconTheme *theme;
GtkTreeIter iter;
- gint width, height;
+ GSList *l;
+ gint width = 0, height = 0;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (button);
+ for (l = button->priv->change_icon_theme_cancellables; l; l = l->next)
+ {
+ GCancellable *cancellable = G_CANCELLABLE (l->data);
+ g_cancellable_cancel (cancellable);
+ }
+ g_slist_free (button->priv->change_icon_theme_cancellables);
+ button->priv->change_icon_theme_cancellables = NULL;
settings = gtk_settings_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
update_label_and_image (button);
- g_assert (gtk_tree_model_get_iter_first (priv->model, &iter));
+ gtk_tree_model_get_iter_first (priv->model, &iter);
theme = get_icon_theme (GTK_WIDGET (button));
case ROW_TYPE_BOOKMARK:
case ROW_TYPE_CURRENT_FOLDER:
if (data)
- pixbuf = gtk_file_system_render_icon (priv->fs, data,
- GTK_WIDGET (button),
- priv->icon_size, NULL);
+ {
+ if (g_file_is_native (G_FILE (data)))
+ {
+ GtkTreePath *path;
+ GCancellable *cancellable;
+ struct ChangeIconThemeData *info;
+
+ info = g_new0 (struct ChangeIconThemeData, 1);
+ info->button = g_object_ref (button);
+ path = gtk_tree_model_get_path (priv->model, &iter);
+ info->row_ref = gtk_tree_row_reference_new (priv->model, path);
+ gtk_tree_path_free (path);
+
+ cancellable =
+ _gtk_file_system_get_info (priv->fs, data,
+ "standard::icon",
+ change_icon_theme_get_info_cb,
+ info);
+ button->priv->change_icon_theme_cancellables =
+ g_slist_append (button->priv->change_icon_theme_cancellables, cancellable);
+ pixbuf = NULL;
+ }
+ else
+ /* Don't call get_info for remote paths to avoid latency and
+ * auth dialogs.
+ * If we switch to a better bookmarks file format (XBEL), we
+ * should use mime info to get a better icon.
+ */
+ pixbuf = gtk_icon_theme_load_icon (theme, "folder-remote",
+ priv->icon_size, 0, NULL);
+ }
else
pixbuf = gtk_icon_theme_load_icon (theme, FALLBACK_ICON_NAME,
priv->icon_size, 0, NULL);
break;
case ROW_TYPE_VOLUME:
if (data)
- pixbuf = gtk_file_system_volume_render_icon (priv->fs, data,
- GTK_WIDGET (button),
- priv->icon_size,
- NULL);
+ pixbuf = _gtk_file_system_volume_render_icon (data,
+ GTK_WIDGET (button),
+ priv->icon_size,
+ NULL);
else
pixbuf = gtk_icon_theme_load_icon (theme, FALLBACK_ICON_NAME,
priv->icon_size, 0, NULL);
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));
}
return gtk_icon_theme_get_default ();
}
-static gchar *
-get_display_name_for_path (GtkFileSystem *fs,
- const GtkFilePath *path)
+
+struct SetDisplayNameData
+{
+ GtkFileChooserButton *button;
+ char *label;
+ GtkTreeRowReference *row_ref;
+};
+
+static void
+set_info_get_info_cb (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer callback_data)
{
- GtkFilePath *parent_path;
- GtkFileFolder *folder;
- gchar *retval;
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
+ GdkPixbuf *pixbuf;
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ GCancellable *model_cancellable;
+ struct SetDisplayNameData *data = callback_data;
+ gboolean is_folder;
- parent_path = NULL;
- retval = NULL;
+ if (!data->button->priv->model)
+ /* button got destroyed */
+ goto out;
- gtk_file_system_get_parent (fs, path, &parent_path, NULL);
+ path = gtk_tree_row_reference_get_path (data->row_ref);
+ if (!path)
+ /* Cancellable doesn't exist anymore in the model */
+ goto out;
- folder = gtk_file_system_get_folder (fs, parent_path ? parent_path : path,
- GTK_FILE_INFO_DISPLAY_NAME, NULL);
+ gtk_tree_model_get_iter (data->button->priv->model, &iter, path);
+ gtk_tree_path_free (path);
- if (folder)
- {
- GtkFileInfo *info;
+ /* Validate the cancellable */
+ gtk_tree_model_get (data->button->priv->model, &iter,
+ CANCELLABLE_COLUMN, &model_cancellable,
+ -1);
+ if (cancellable != model_cancellable)
+ goto out;
- info = gtk_file_folder_get_info (folder, path, NULL);
- g_object_unref (folder);
+ gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
+ CANCELLABLE_COLUMN, NULL,
+ -1);
- if (info)
- {
- retval = g_strdup (gtk_file_info_get_display_name (info));
- gtk_file_info_free (info);
- }
- }
+ if (cancelled || error)
+ /* There was an error, leave the fallback name in there */
+ goto out;
- if (parent_path)
- gtk_file_path_free (parent_path);
+ pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
- if (!retval)
- retval = g_strdup (_(FALLBACK_DISPLAY_NAME));
+ if (!data->label)
+ data->label = g_strdup (g_file_info_get_display_name (info));
- return retval;
+ is_folder = _gtk_file_info_consider_as_directory (info);
+
+ gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
+ ICON_COLUMN, pixbuf,
+ DISPLAY_NAME_COLUMN, data->label,
+ IS_FOLDER_COLUMN, is_folder,
+ -1);
+
+ if (pixbuf)
+ g_object_unref (pixbuf);
+
+out:
+ g_object_unref (data->button);
+ g_free (data->label);
+ gtk_tree_row_reference_free (data->row_ref);
+ g_free (data);
+
+ g_object_unref (cancellable);
+}
+
+static void
+set_info_for_file_at_iter (GtkFileChooserButton *button,
+ GFile *file,
+ GtkTreeIter *iter)
+{
+ struct SetDisplayNameData *data;
+ GtkTreePath *tree_path;
+ GCancellable *cancellable;
+
+ data = g_new0 (struct SetDisplayNameData, 1);
+ data->button = g_object_ref (button);
+ data->label = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
+
+ tree_path = gtk_tree_model_get_path (button->priv->model, iter);
+ data->row_ref = gtk_tree_row_reference_new (button->priv->model, tree_path);
+ gtk_tree_path_free (tree_path);
+
+ cancellable = _gtk_file_system_get_info (button->priv->fs, file,
+ "standard::type,standard::icon,standard::display-name",
+ set_info_get_info_cb, data);
+
+ gtk_list_store_set (GTK_LIST_STORE (button->priv->model), iter,
+ CANCELLABLE_COLUMN, cancellable,
+ -1);
}
/* Shortcuts Model */
{
gchar type;
gpointer data;
+ GCancellable *cancellable;
gtk_tree_model_get (button->priv->model, iter,
TYPE_COLUMN, &type,
DATA_COLUMN, &data,
+ CANCELLABLE_COLUMN, &cancellable,
-1);
+ if (cancellable)
+ g_cancellable_cancel (cancellable);
+
switch (type)
{
case ROW_TYPE_SPECIAL:
case ROW_TYPE_SHORTCUT:
case ROW_TYPE_BOOKMARK:
case ROW_TYPE_CURRENT_FOLDER:
- gtk_file_path_free (data);
+ g_object_unref (data);
break;
case ROW_TYPE_VOLUME:
- gtk_file_system_volume_free (button->priv->fs, data);
+ _gtk_file_system_volume_free (data);
break;
default:
break;
}
}
+static void
+model_add_special_get_info_cb (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer user_data)
+{
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ GdkPixbuf *pixbuf;
+ GCancellable *model_cancellable;
+ struct ChangeIconThemeData *data = user_data;
+ gchar *name;
+
+ if (!data->button->priv->model)
+ /* button got destroyed */
+ goto out;
+
+ path = gtk_tree_row_reference_get_path (data->row_ref);
+ if (!path)
+ /* Cancellable doesn't exist anymore in the model */
+ goto out;
+
+ gtk_tree_model_get_iter (data->button->priv->model, &iter, path);
+ gtk_tree_path_free (path);
+
+ gtk_tree_model_get (data->button->priv->model, &iter,
+ CANCELLABLE_COLUMN, &model_cancellable,
+ -1);
+ if (cancellable != model_cancellable)
+ goto out;
+
+ gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
+ CANCELLABLE_COLUMN, NULL,
+ -1);
+
+ if (cancelled || error)
+ goto out;
+
+ pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (data->button), data->button->priv->icon_size);
+
+ if (pixbuf)
+ {
+ gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
+ ICON_COLUMN, pixbuf,
+ -1);
+ g_object_unref (pixbuf);
+ }
+
+ gtk_tree_model_get (data->button->priv->model, &iter,
+ DISPLAY_NAME_COLUMN, &name,
+ -1);
+ if (!name)
+ gtk_list_store_set (GTK_LIST_STORE (data->button->priv->model), &iter,
+ DISPLAY_NAME_COLUMN, g_file_info_get_display_name (info),
+ -1);
+ g_free (name);
+
+out:
+ g_object_unref (data->button);
+ gtk_tree_row_reference_free (data->row_ref);
+ g_free (data);
+
+ g_object_unref (cancellable);
+}
+
static inline void
model_add_special (GtkFileChooserButton *button)
{
const gchar *homedir;
- gchar *desktopdir = NULL;
+ const gchar *desktopdir;
GtkListStore *store;
GtkTreeIter iter;
- GtkFilePath *path;
- GdkPixbuf *pixbuf;
+ GFile *file;
gint pos;
store = GTK_LIST_STORE (button->priv->model);
if (homedir)
{
- path = gtk_file_system_filename_to_path (button->priv->fs, homedir);
- pixbuf = gtk_file_system_render_icon (button->priv->fs, path,
- GTK_WIDGET (button),
- button->priv->icon_size, NULL);
+ GtkTreePath *tree_path;
+ GCancellable *cancellable;
+ struct ChangeIconThemeData *info;
+
+ file = g_file_new_for_path (homedir);
gtk_list_store_insert (store, &iter, pos);
pos++;
+
+ info = g_new0 (struct ChangeIconThemeData, 1);
+ info->button = g_object_ref (button);
+ tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
+ info->row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (store),
+ tree_path);
+ gtk_tree_path_free (tree_path);
+
+ cancellable = _gtk_file_system_get_info (button->priv->fs, file,
+ "standard::icon,standard::display-name",
+ model_add_special_get_info_cb, info);
+
gtk_list_store_set (store, &iter,
- ICON_COLUMN, pixbuf,
- DISPLAY_NAME_COLUMN, _(HOME_DISPLAY_NAME),
+ ICON_COLUMN, NULL,
+ DISPLAY_NAME_COLUMN, NULL,
TYPE_COLUMN, ROW_TYPE_SPECIAL,
- DATA_COLUMN, path,
+ DATA_COLUMN, file,
+ IS_FOLDER_COLUMN, TRUE,
+ CANCELLABLE_COLUMN, cancellable,
-1);
- if (pixbuf)
- g_object_unref (pixbuf);
button->priv->n_special++;
-
-#ifndef G_OS_WIN32
- desktopdir = g_build_filename (homedir, DESKTOP_DISPLAY_NAME, NULL);
-#endif
}
-#ifdef G_OS_WIN32
- desktopdir = _gtk_file_system_win32_get_desktop ();
-#endif
+ desktopdir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
if (desktopdir)
{
- path = gtk_file_system_filename_to_path (button->priv->fs, desktopdir);
- g_free (desktopdir);
- pixbuf = gtk_file_system_render_icon (button->priv->fs, path,
- GTK_WIDGET (button),
- button->priv->icon_size, NULL);
+ GtkTreePath *tree_path;
+ GCancellable *cancellable;
+ struct ChangeIconThemeData *info;
+
+ file = g_file_new_for_path (desktopdir);
gtk_list_store_insert (store, &iter, pos);
pos++;
+
+ info = g_new0 (struct ChangeIconThemeData, 1);
+ info->button = g_object_ref (button);
+ tree_path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
+ info->row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (store),
+ tree_path);
+ gtk_tree_path_free (tree_path);
+
+ cancellable = _gtk_file_system_get_info (button->priv->fs, file,
+ "standard::icon,standard::display-name",
+ model_add_special_get_info_cb, info);
+
gtk_list_store_set (store, &iter,
TYPE_COLUMN, ROW_TYPE_SPECIAL,
- ICON_COLUMN, pixbuf,
+ ICON_COLUMN, NULL,
DISPLAY_NAME_COLUMN, _(DESKTOP_DISPLAY_NAME),
- DATA_COLUMN, path,
+ DATA_COLUMN, file,
+ IS_FOLDER_COLUMN, TRUE,
+ CANCELLABLE_COLUMN, cancellable,
-1);
- if (pixbuf)
- g_object_unref (pixbuf);
button->priv->n_special++;
}
}
{
GtkListStore *store;
gint pos;
-
+ gboolean local_only;
+ GtkFileSystem *file_system;
+ GSList *l;
+
if (!volumes)
return;
store = GTK_LIST_STORE (button->priv->model);
pos = model_get_type_position (button, ROW_TYPE_VOLUME);
+ local_only = gtk_file_chooser_get_local_only (GTK_FILE_CHOOSER (button->priv->dialog));
+ file_system = button->priv->fs;
- do
+ for (l = volumes; l; l = l->next)
{
+ GtkFileSystemVolume *volume;
GtkTreeIter iter;
GdkPixbuf *pixbuf;
gchar *display_name;
- pixbuf = gtk_file_system_volume_render_icon (button->priv->fs,
- volumes->data,
- GTK_WIDGET (button),
- button->priv->icon_size,
- NULL);
- display_name = gtk_file_system_volume_get_display_name (button->priv->fs,
- volumes->data);
+ volume = l->data;
+
+ if (local_only)
+ {
+ if (_gtk_file_system_volume_is_mounted (volume))
+ {
+ 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;
+ }
+ }
+ }
+
+ pixbuf = _gtk_file_system_volume_render_icon (volume,
+ GTK_WIDGET (button),
+ button->priv->icon_size,
+ NULL);
+ display_name = _gtk_file_system_volume_get_display_name (volume);
gtk_list_store_insert (store, &iter, pos);
gtk_list_store_set (store, &iter,
ICON_COLUMN, pixbuf,
DISPLAY_NAME_COLUMN, display_name,
TYPE_COLUMN, ROW_TYPE_VOLUME,
- DATA_COLUMN, volumes->data,
+ DATA_COLUMN, volume,
+ IS_FOLDER_COLUMN, TRUE,
-1);
if (pixbuf)
button->priv->n_volumes++;
pos++;
- volumes = volumes->next;
}
- while (volumes);
}
+extern gchar * _gtk_file_chooser_label_for_file (GFile *file);
+
static void
model_add_bookmarks (GtkFileChooserButton *button,
GSList *bookmarks)
GtkListStore *store;
GtkTreeIter iter;
gint pos;
+ gboolean local_only;
+ GSList *l;
if (!bookmarks)
return;
store = GTK_LIST_STORE (button->priv->model);
- pos = model_get_type_position (button, ROW_TYPE_BOOKMARK_SEPARATOR);
+ pos = model_get_type_position (button, ROW_TYPE_BOOKMARK);
+ local_only = gtk_file_chooser_get_local_only (GTK_FILE_CHOOSER (button->priv->dialog));
+
+ for (l = bookmarks; l; l = l->next)
+ {
+ GFile *file;
+
+ file = l->data;
+
+ if (g_file_is_native (file))
+ {
+ gtk_list_store_insert (store, &iter, pos);
+ gtk_list_store_set (store, &iter,
+ ICON_COLUMN, NULL,
+ DISPLAY_NAME_COLUMN, _(FALLBACK_DISPLAY_NAME),
+ TYPE_COLUMN, ROW_TYPE_BOOKMARK,
+ DATA_COLUMN, g_object_ref (file),
+ IS_FOLDER_COLUMN, FALSE,
+ -1);
+ set_info_for_file_at_iter (button, file, &iter);
+ }
+ else
+ {
+ gchar *label;
+ GtkIconTheme *icon_theme;
+ GdkPixbuf *pixbuf;
+
+ if (local_only)
+ continue;
+
+ /* Don't call get_info for remote paths to avoid latency and
+ * auth dialogs.
+ * If we switch to a better bookmarks file format (XBEL), we
+ * should use mime info to get a better icon.
+ */
+ label = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
+ if (!label)
+ label = _gtk_file_chooser_label_for_file (file);
+
+ icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
+ pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote",
+ button->priv->icon_size, 0, NULL);
+
+ gtk_list_store_insert (store, &iter, pos);
+ gtk_list_store_set (store, &iter,
+ ICON_COLUMN, pixbuf,
+ DISPLAY_NAME_COLUMN, label,
+ TYPE_COLUMN, ROW_TYPE_BOOKMARK,
+ DATA_COLUMN, g_object_ref (file),
+ IS_FOLDER_COLUMN, TRUE,
+ -1);
+
+ g_free (label);
+ g_object_unref (pixbuf);
+ }
+
+ button->priv->n_bookmarks++;
+ pos++;
+ }
- if (!button->priv->has_bookmark_separator)
+ if (button->priv->n_bookmarks > 0 &&
+ !button->priv->has_bookmark_separator)
{
+ pos = model_get_type_position (button, ROW_TYPE_BOOKMARK_SEPARATOR);
+
gtk_list_store_insert (store, &iter, pos);
gtk_list_store_set (store, &iter,
ICON_COLUMN, NULL,
DISPLAY_NAME_COLUMN, NULL,
TYPE_COLUMN, ROW_TYPE_BOOKMARK_SEPARATOR,
DATA_COLUMN, NULL,
+ IS_FOLDER_COLUMN, FALSE,
-1);
button->priv->has_bookmark_separator = TRUE;
}
-
- do
- {
- GdkPixbuf *pixbuf;
- gchar *display_name;
-
- pos++;
- pixbuf = gtk_file_system_render_icon (button->priv->fs, bookmarks->data,
- GTK_WIDGET (button),
- button->priv->icon_size, NULL);
- display_name = get_display_name_for_path (button->priv->fs,
- bookmarks->data);
-
- gtk_list_store_insert (store, &iter, pos);
- gtk_list_store_set (store, &iter,
- ICON_COLUMN, pixbuf,
- DISPLAY_NAME_COLUMN, display_name,
- TYPE_COLUMN, ROW_TYPE_BOOKMARK,
- DATA_COLUMN, gtk_file_path_copy (bookmarks->data),
- -1);
- if (pixbuf)
- g_object_unref (pixbuf);
- g_free (display_name);
-
- button->priv->n_bookmarks++;
- bookmarks = bookmarks->next;
- }
- while (bookmarks);
}
static void
model_update_current_folder (GtkFileChooserButton *button,
- const GtkFilePath *path)
+ GFile *file)
{
GtkListStore *store;
GtkTreeIter iter;
gint pos;
- GdkPixbuf *pixbuf;
- gchar *display_name;
- if (!path)
+ if (!file)
return;
store = GTK_LIST_STORE (button->priv->model);
DISPLAY_NAME_COLUMN, NULL,
TYPE_COLUMN, ROW_TYPE_CURRENT_FOLDER_SEPARATOR,
DATA_COLUMN, NULL,
+ IS_FOLDER_COLUMN, FALSE,
-1);
button->priv->has_current_folder_separator = TRUE;
}
model_free_row_data (button, &iter);
}
- pixbuf = gtk_file_system_render_icon (button->priv->fs, path,
- GTK_WIDGET (button),
- button->priv->icon_size, NULL);
- display_name = get_display_name_for_path (button->priv->fs, path);
- gtk_list_store_set (store, &iter,
- ICON_COLUMN, pixbuf,
- DISPLAY_NAME_COLUMN, display_name,
- TYPE_COLUMN, ROW_TYPE_CURRENT_FOLDER,
- DATA_COLUMN, gtk_file_path_copy (path),
- -1);
- if (pixbuf)
- g_object_unref (pixbuf);
- g_free (display_name);
+ if (g_file_is_native (file))
+ {
+ gtk_list_store_set (store, &iter,
+ ICON_COLUMN, NULL,
+ DISPLAY_NAME_COLUMN, _(FALLBACK_DISPLAY_NAME),
+ TYPE_COLUMN, ROW_TYPE_CURRENT_FOLDER,
+ DATA_COLUMN, g_object_ref (file),
+ IS_FOLDER_COLUMN, FALSE,
+ -1);
+ set_info_for_file_at_iter (button, file, &iter);
+ }
+ else
+ {
+ gchar *label;
+ GtkIconTheme *icon_theme;
+ GdkPixbuf *pixbuf;
+
+ /* Don't call get_info for remote paths to avoid latency and
+ * auth dialogs.
+ * If we switch to a better bookmarks file format (XBEL), we
+ * should use mime info to get a better icon.
+ */
+ label = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
+ if (!label)
+ label = _gtk_file_chooser_label_for_file (file);
+
+ icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button)));
+
+ if (g_file_is_native (file))
+ pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder",
+ button->priv->icon_size, 0, NULL);
+ else
+ pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote",
+ button->priv->icon_size, 0, NULL);
+
+ gtk_list_store_set (store, &iter,
+ ICON_COLUMN, pixbuf,
+ DISPLAY_NAME_COLUMN, label,
+ TYPE_COLUMN, ROW_TYPE_CURRENT_FOLDER,
+ DATA_COLUMN, g_object_ref (file),
+ IS_FOLDER_COLUMN, TRUE,
+ -1);
+
+ g_free (label);
+ g_object_unref (pixbuf);
+ }
}
static inline void
DISPLAY_NAME_COLUMN, NULL,
TYPE_COLUMN, ROW_TYPE_OTHER_SEPARATOR,
DATA_COLUMN, NULL,
+ IS_FOLDER_COLUMN, FALSE,
-1);
button->priv->has_other_separator = TRUE;
pos++;
DISPLAY_NAME_COLUMN, _("Other..."),
TYPE_COLUMN, ROW_TYPE_OTHER,
DATA_COLUMN, NULL,
+ IS_FOLDER_COLUMN, FALSE,
-1);
}
/* Filter Model */
static inline gboolean
-test_if_path_is_visible (GtkFileSystem *fs,
- const GtkFilePath *path,
- gboolean local_only)
+test_if_file_is_visible (GtkFileSystem *fs,
+ GFile *file,
+ gboolean local_only,
+ gboolean is_folder)
{
- GtkFilePath *parent_path;
- GtkFileFolder *folder;
- GtkFileInfo *info;
-
- if (!path)
+ if (!file)
return FALSE;
- if (local_only && !gtk_file_system_path_is_local (fs, path))
+ if (local_only && !g_file_is_native (file))
return FALSE;
- parent_path = NULL;
- gtk_file_system_get_parent (fs, path, &parent_path, NULL);
-
- folder = gtk_file_system_get_folder (fs, parent_path ? parent_path : path,
- GTK_FILE_INFO_IS_FOLDER, NULL);
- gtk_file_path_free (parent_path);
-
- if (folder)
- {
- info = gtk_file_folder_get_info (folder, path, NULL);
- g_object_unref (folder);
- }
- else
- info = NULL;
-
- if (!info)
+ if (!is_folder)
return FALSE;
- else if (!gtk_file_info_get_is_folder (info))
- {
- gtk_file_info_free (info);
- return FALSE;
- }
-
- gtk_file_info_free (info);
return TRUE;
}
GtkTreeIter *iter,
gpointer user_data)
{
- GtkFileChooserButtonPrivate *priv;
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
+ GtkFileChooserButtonPrivate *priv = button->priv;
gchar type;
gpointer data;
- gboolean local_only, retval;
+ gboolean local_only, retval, is_folder;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (user_data);
type = ROW_TYPE_INVALID;
data = NULL;
local_only = gtk_file_chooser_get_local_only (GTK_FILE_CHOOSER (priv->dialog));
gtk_tree_model_get (model, iter,
TYPE_COLUMN, &type,
DATA_COLUMN, &data,
+ IS_FOLDER_COLUMN, &is_folder,
-1);
switch (type)
case ROW_TYPE_SPECIAL:
case ROW_TYPE_SHORTCUT:
case ROW_TYPE_BOOKMARK:
- retval = test_if_path_is_visible (priv->fs, data, local_only);
+ retval = test_if_file_is_visible (priv->fs, data, local_only, is_folder);
break;
case ROW_TYPE_VOLUME:
{
- GtkFilePath *base_path;
-
- base_path = gtk_file_system_volume_get_base_path (priv->fs, data);
- if (base_path)
+ retval = TRUE;
+ if (local_only)
{
- retval = (!local_only ||
- gtk_file_system_path_is_local (priv->fs, base_path));
- gtk_file_path_free (base_path);
+ if (_gtk_file_system_volume_is_mounted (data))
+ {
+ GFile *base_file;
+
+ base_file = _gtk_file_system_volume_get_root (data);
+
+ if (base_file)
+ {
+ if (!g_file_is_native (base_file))
+ retval = FALSE;
+ g_object_unref (base_file);
+ }
+ else
+ retval = FALSE;
+ }
}
- else
- retval = FALSE;
}
break;
default:
static void
update_combo_box (GtkFileChooserButton *button)
{
- GtkFileChooserButtonPrivate *priv;
- GSList *paths;
+ GtkFileChooserButtonPrivate *priv = button->priv;
+ GSList *files;
GtkTreeIter iter;
gboolean row_found;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (button);
+ gtk_tree_model_get_iter_first (priv->filter_model, &iter);
- g_assert (gtk_tree_model_get_iter_first (priv->filter_model, &iter));
-
- paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (priv->dialog));
+ files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (priv->dialog));
row_found = FALSE;
case ROW_TYPE_SHORTCUT:
case ROW_TYPE_BOOKMARK:
case ROW_TYPE_CURRENT_FOLDER:
- row_found = (paths &&
- paths->data &&
- gtk_file_path_compare (data, paths->data) == 0);
+ row_found = (files &&
+ files->data &&
+ g_file_equal (data, files->data));
break;
case ROW_TYPE_VOLUME:
{
- GtkFilePath *base_path;
-
- base_path = gtk_file_system_volume_get_base_path (priv->fs, data);
- row_found = (paths &&
- paths->data &&
- gtk_file_path_compare (base_path, paths->data) == 0);
- gtk_file_path_free (base_path);
+ GFile *base_file;
+
+ base_file = _gtk_file_system_volume_get_root (data);
+ if (base_file)
+ {
+ row_found = (files &&
+ files->data &&
+ g_file_equal (base_file, files->data));
+ g_object_unref (base_file);
+ }
}
break;
default:
while (!row_found && gtk_tree_model_iter_next (priv->filter_model, &iter));
/* If it hasn't been found already, update & select the current-folder row. */
- if (!row_found && paths && paths->data)
+ if (!row_found && files && files->data)
{
GtkTreeIter filter_iter;
gint pos;
- model_update_current_folder (button, paths->data);
+ model_update_current_folder (button, files->data);
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->filter_model));
pos = model_get_type_position (button, ROW_TYPE_CURRENT_FOLDER);
- g_assert (gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos));
+ gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos);
gtk_tree_model_filter_convert_child_iter_to_iter (GTK_TREE_MODEL_FILTER (priv->filter_model),
&filter_iter, &iter);
g_signal_handler_unblock (priv->combo_box, priv->combo_box_changed_id);
}
- gtk_file_paths_free (paths);
+ g_slist_foreach (files, (GFunc) g_object_unref, NULL);
+ g_slist_free (files);
}
/* Button */
+static void
+update_label_get_info_cb (GCancellable *cancellable,
+ GFileInfo *info,
+ const GError *error,
+ gpointer data)
+{
+ gboolean cancelled = g_cancellable_is_cancelled (cancellable);
+ GdkPixbuf *pixbuf;
+ GtkFileChooserButton *button = data;
+ GtkFileChooserButtonPrivate *priv = button->priv;
+
+ if (cancellable != priv->update_button_cancellable)
+ goto out;
+
+ priv->update_button_cancellable = NULL;
+
+ if (cancelled || error)
+ goto out;
+
+ gtk_label_set_text (GTK_LABEL (priv->label), g_file_info_get_display_name (info));
+
+ pixbuf = _gtk_file_info_render_icon (info, GTK_WIDGET (priv->image), priv->icon_size);
+
+ if (!pixbuf)
+ pixbuf = gtk_icon_theme_load_icon (get_icon_theme (GTK_WIDGET (priv->image)),
+ FALLBACK_ICON_NAME,
+ priv->icon_size, 0, NULL);
+
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf);
+ if (pixbuf)
+ g_object_unref (pixbuf);
+
+out:
+ g_object_unref (button);
+ g_object_unref (cancellable);
+}
+
static void
update_label_and_image (GtkFileChooserButton *button)
{
- GtkFileChooserButtonPrivate *priv;
+ GtkFileChooserButtonPrivate *priv = button->priv;
GdkPixbuf *pixbuf;
gchar *label_text;
- GSList *paths;
+ GSList *files;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (button);
- paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (button->priv->dialog));
+ files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (priv->dialog));
label_text = NULL;
pixbuf = NULL;
- if (paths)
+ if (priv->update_button_cancellable)
{
- GtkFilePath *path, *parent_path;
- GtkFileSystemVolume *volume;
- GtkFileFolder *folder;
-
- path = paths->data;
+ g_cancellable_cancel (priv->update_button_cancellable);
+ priv->update_button_cancellable = NULL;
+ }
+
+ if (files && files->data)
+ {
+ GFile *file;
+ GtkFileSystemVolume *volume = NULL;
+
+ file = files->data;
- volume = gtk_file_system_get_volume_for_path (priv->fs, path);
+ volume = _gtk_file_system_get_volume_for_file (priv->fs, file);
if (volume)
{
- GtkFilePath *base_path;
+ GFile *base_file;
- base_path = gtk_file_system_volume_get_base_path (priv->fs, volume);
- if (base_path && gtk_file_path_compare (base_path, path) == 0)
+ base_file = _gtk_file_system_volume_get_root (volume);
+ if (base_file && g_file_equal (base_file, file))
{
- label_text = gtk_file_system_volume_get_display_name (priv->fs,
- volume);
- pixbuf = gtk_file_system_volume_render_icon (priv->fs, volume,
- GTK_WIDGET (button),
- priv->icon_size,
- NULL);
+ label_text = _gtk_file_system_volume_get_display_name (volume);
+ pixbuf = _gtk_file_system_volume_render_icon (volume,
+ GTK_WIDGET (button),
+ priv->icon_size,
+ NULL);
}
- if (base_path)
- gtk_file_path_free (base_path);
+ if (base_file)
+ g_object_unref (base_file);
- gtk_file_system_volume_free (priv->fs, volume);
+ _gtk_file_system_volume_free (volume);
if (label_text)
goto out;
}
- if (!pixbuf)
- pixbuf = gtk_file_system_render_icon (priv->fs, path,
- GTK_WIDGET (button),
- priv->icon_size, NULL);
-
- parent_path = NULL;
- gtk_file_system_get_parent (priv->fs, path, &parent_path, NULL);
-
- folder = gtk_file_system_get_folder (priv->fs,
- parent_path ? parent_path : path,
- GTK_FILE_INFO_DISPLAY_NAME, NULL);
- gtk_file_path_free (parent_path);
-
- if (folder)
+ if (g_file_is_native (file))
{
- GtkFileInfo *info;
-
- info = gtk_file_folder_get_info (folder, path, NULL);
- g_object_unref (folder);
-
- if (info)
- {
- label_text = g_strdup (gtk_file_info_get_display_name (info));
- gtk_file_info_free (info);
- }
+ priv->update_button_cancellable =
+ _gtk_file_system_get_info (priv->fs, file,
+ "standard::icon,standard::display-name",
+ update_label_get_info_cb,
+ g_object_ref (button));
+ }
+ else
+ {
+ GdkPixbuf *pixbuf;
+
+ label_text = _gtk_file_system_get_bookmark_label (button->priv->fs, file);
+
+ pixbuf = gtk_icon_theme_load_icon (get_icon_theme (GTK_WIDGET (priv->image)),
+ "text-x-generic",
+ priv->icon_size, 0, NULL);
+
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf);
+
+ if (pixbuf)
+ g_object_unref (pixbuf);
}
-
- out:
- gtk_file_paths_free (paths);
}
+out:
+ g_slist_foreach (files, (GFunc) g_object_unref, NULL);
+ g_slist_free (files);
if (label_text)
{
g_free (label_text);
}
else
- gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME));
-
- if (!pixbuf)
- pixbuf = gtk_icon_theme_load_icon (get_icon_theme (GTK_WIDGET (button)),
- FALLBACK_ICON_NAME,
- priv->icon_size, 0, NULL);
-
- gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf);
- if (pixbuf)
- g_object_unref (pixbuf);
+ {
+ gtk_label_set_text (GTK_LABEL (priv->label), _(FALLBACK_DISPLAY_NAME));
+ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), NULL);
+ }
}
fs_volumes_changed_cb (GtkFileSystem *fs,
gpointer user_data)
{
- GtkFileChooserButtonPrivate *priv;
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
+ GtkFileChooserButtonPrivate *priv = button->priv;
GSList *volumes;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (user_data);
-
model_remove_rows (user_data,
model_get_type_position (user_data, ROW_TYPE_VOLUME),
priv->n_volumes);
priv->n_volumes = 0;
- volumes = gtk_file_system_list_volumes (fs);
+ volumes = _gtk_file_system_list_volumes (fs);
model_add_volumes (user_data, volumes);
g_slist_free (volumes);
fs_bookmarks_changed_cb (GtkFileSystem *fs,
gpointer user_data)
{
- GtkFileChooserButtonPrivate *priv;
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
+ GtkFileChooserButtonPrivate *priv = button->priv;
GSList *bookmarks;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (user_data);
-
- bookmarks = gtk_file_system_list_bookmarks (fs);
- if (!bookmarks)
- {
- model_remove_rows (user_data,
- model_get_type_position (user_data,
- ROW_TYPE_BOOKMARK_SEPARATOR),
- (priv->n_bookmarks + priv->has_bookmark_separator));
- priv->has_bookmark_separator = FALSE;
- }
- else
- model_remove_rows (user_data,
- model_get_type_position (user_data, ROW_TYPE_BOOKMARK),
- priv->n_bookmarks);
-
+ bookmarks = _gtk_file_system_list_bookmarks (fs);
+ model_remove_rows (user_data,
+ model_get_type_position (user_data,
+ ROW_TYPE_BOOKMARK_SEPARATOR),
+ (priv->n_bookmarks + priv->has_bookmark_separator));
+ priv->has_bookmark_separator = FALSE;
priv->n_bookmarks = 0;
model_add_bookmarks (user_data, bookmarks);
- gtk_file_paths_free (bookmarks);
+ g_slist_foreach (bookmarks, (GFunc) g_object_unref, NULL);
+ g_slist_free (bookmarks);
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->filter_model));
static void
open_dialog (GtkFileChooserButton *button)
{
- GtkFileChooserButtonPrivate *priv;
-
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (button);
+ GtkFileChooserButtonPrivate *priv = button->priv;
/* Setup the dialog parent to be chooser button's toplevel, and be modal
as needed. */
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),
if (!priv->active)
{
- GSList *paths;
+ GSList *files;
g_signal_handler_block (priv->dialog,
priv->dialog_folder_changed_id);
priv->dialog_file_activated_id);
g_signal_handler_block (priv->dialog,
priv->dialog_selection_changed_id);
- paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (priv->dialog));
- if (paths)
+ files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (priv->dialog));
+ if (files)
{
- if (paths->data)
- priv->old_path = gtk_file_path_copy (paths->data);
+ if (files->data)
+ priv->old_file = g_object_ref (files->data);
- gtk_file_paths_free (paths);
+ g_slist_foreach (files, (GFunc) g_object_unref, NULL);
+ g_slist_free (files);
}
priv->active = TRUE;
if (gtk_combo_box_get_active_iter (combo_box, &iter))
{
- GtkFileChooserButtonPrivate *priv;
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
+ GtkFileChooserButtonPrivate *priv = button->priv;
gchar type;
gpointer data;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (user_data);
-
type = ROW_TYPE_INVALID;
data = NULL;
case ROW_TYPE_CURRENT_FOLDER:
gtk_file_chooser_unselect_all (GTK_FILE_CHOOSER (priv->dialog));
if (data)
- _gtk_file_chooser_set_current_folder_path (GTK_FILE_CHOOSER (priv->dialog),
- data, NULL);
+ gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (priv->dialog),
+ data, NULL);
break;
case ROW_TYPE_VOLUME:
{
- GtkFilePath *base_path;
+ GFile *base_file;
gtk_file_chooser_unselect_all (GTK_FILE_CHOOSER (priv->dialog));
- base_path = gtk_file_system_volume_get_base_path (priv->fs, data);
- if (base_path)
+ base_file = _gtk_file_system_volume_get_root (data);
+ if (base_file)
{
- _gtk_file_chooser_set_current_folder_path (GTK_FILE_CHOOSER (priv->dialog),
- base_path, NULL);
- gtk_file_path_free (base_path);
+ gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (priv->dialog),
+ base_file, NULL);
+ g_object_unref (base_file);
}
}
break;
dialog_current_folder_changed_cb (GtkFileChooser *dialog,
gpointer user_data)
{
- g_signal_emit_by_name (user_data, "current-folder-changed");
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
+ GtkFileChooserButtonPrivate *priv = button->priv;
+
+ priv->folder_has_been_set = TRUE;
+
+ g_signal_emit_by_name (button, "current-folder-changed");
}
static void
if (g_ascii_strcasecmp (pspec->name, "local-only") == 0)
{
- GtkFileChooserButtonPrivate *priv;
-
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (user_data);
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
+ GtkFileChooserButtonPrivate *priv = button->priv;
if (priv->has_current_folder)
{
pos = model_get_type_position (user_data,
ROW_TYPE_CURRENT_FOLDER);
- g_assert (gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos));
+ gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos);
data = NULL;
gtk_tree_model_get (priv->model, &iter, DATA_COLUMN, &data, -1);
/* If the path isn't local but we're in local-only mode now, remove
* the custom-folder row */
- if (data &&
- (!gtk_file_system_path_is_local (priv->fs, data) &&
- gtk_file_chooser_get_local_only (GTK_FILE_CHOOSER (priv->dialog))))
+ if (data && g_file_is_native (G_FILE (data)) &&
+ gtk_file_chooser_get_local_only (GTK_FILE_CHOOSER (priv->dialog)))
{
pos--;
model_remove_rows (user_data, pos, 2);
gint response,
gpointer user_data)
{
- GtkFileChooserButtonPrivate *priv;
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
+ GtkFileChooserButtonPrivate *priv = button->priv;
- priv = GTK_FILE_CHOOSER_BUTTON_GET_PRIVATE (user_data);
-
- if (response == GTK_RESPONSE_ACCEPT)
+ if (response == GTK_RESPONSE_ACCEPT ||
+ response == GTK_RESPONSE_OK)
{
g_signal_emit_by_name (user_data, "current-folder-changed");
g_signal_emit_by_name (user_data, "selection-changed");
}
- else if (priv->old_path)
+ else if (priv->old_file)
{
switch (gtk_file_chooser_get_action (GTK_FILE_CHOOSER (dialog)))
{
case GTK_FILE_CHOOSER_ACTION_OPEN:
- _gtk_file_chooser_select_path (GTK_FILE_CHOOSER (dialog), priv->old_path,
- NULL);
+ gtk_file_chooser_select_file (GTK_FILE_CHOOSER (dialog), priv->old_file,
+ NULL);
break;
case GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER:
- _gtk_file_chooser_set_current_folder_path (GTK_FILE_CHOOSER (dialog),
- priv->old_path, NULL);
+ gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (dialog),
+ priv->old_file, NULL);
break;
default:
g_assert_not_reached ();
else
gtk_file_chooser_unselect_all (GTK_FILE_CHOOSER (dialog));
- if (priv->old_path)
+ if (priv->old_file)
{
- gtk_file_path_free (priv->old_path);
- priv->old_path = NULL;
+ g_object_unref (priv->old_file);
+ priv->old_file = NULL;
}
update_label_and_image (user_data);
gtk_widget_set_sensitive (priv->combo_box, TRUE);
gtk_widget_hide (priv->dialog);
+
+ if (response == GTK_RESPONSE_ACCEPT ||
+ response == GTK_RESPONSE_OK)
+ g_signal_emit (user_data, file_chooser_button_signals[FILE_SET], 0);
}
* Returns: a new button widget.
*
* Since: 2.6
+ * Deprecated: 2.14: Use gtk_file_chooser_button_new() instead.
**/
GtkWidget *
gtk_file_chooser_button_new_with_backend (const gchar *title,
return g_object_new (GTK_TYPE_FILE_CHOOSER_BUTTON,
"action", action,
"title", (title ? title : _(DEFAULT_TITLE)),
- "file-system-backend", backend,
NULL);
}
/**
* gtk_file_chooser_button_new_with_dialog:
- * @dialog: the #GtkFileChooserDialog widget to use.
- *
- * Creates a #GtkFileChooserButton widget which uses @dialog as it's
- * file-picking window. Note that @dialog must be a #GtkFileChooserDialog (or
- * subclass).
- *
+ * @dialog: the widget to use as dialog
+ *
+ * Creates a #GtkFileChooserButton widget which uses @dialog as its
+ * file-picking window.
+ *
+ * Note that @dialog must be a #GtkDialog (or subclass) which
+ * implements the #GtkFileChooser interface and must not have
+ * %GTK_DIALOG_DESTROY_WITH_PARENT set.
+ *
+ * Also note that the dialog needs to have its confirmative button
+ * added with response %GTK_RESPONSE_ACCEPT or %GTK_RESPONSE_OK in
+ * order for the button to take over the file selected in the dialog.
+ *
* Returns: a new button widget.
- *
+ *
* Since: 2.6
**/
GtkWidget *
gtk_file_chooser_button_new_with_dialog (GtkWidget *dialog)
{
- g_return_val_if_fail (GTK_IS_FILE_CHOOSER_DIALOG (dialog), NULL);
+ g_return_val_if_fail (GTK_IS_FILE_CHOOSER (dialog) && GTK_IS_DIALOG (dialog), NULL);
return g_object_new (GTK_TYPE_FILE_CHOOSER_BUTTON,
"dialog", dialog,
g_object_notify (G_OBJECT (button), "width-chars");
}
+/**
+ * gtk_file_chooser_button_set_focus_on_click:
+ * @button: a #GtkFileChooserButton
+ * @focus_on_click: whether the button grabs focus when clicked with the mouse
+ *
+ * Sets whether the button will grab focus when it is clicked with the mouse.
+ * Making mouse clicks not grab focus is useful in places like toolbars where
+ * you don't want the keyboard focus removed from the main area of the
+ * application.
+ *
+ * Since: 2.10
+ **/
+void
+gtk_file_chooser_button_set_focus_on_click (GtkFileChooserButton *button,
+ gboolean focus_on_click)
+{
+ GtkFileChooserButtonPrivate *priv;
+
+ g_return_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (button));
+
+ priv = button->priv;
+
+ focus_on_click = focus_on_click != FALSE;
+
+ if (priv->focus_on_click != focus_on_click)
+ {
+ priv->focus_on_click = focus_on_click;
+ gtk_button_set_focus_on_click (GTK_BUTTON (priv->button), focus_on_click);
+ gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (priv->combo_box), focus_on_click);
+
+ g_object_notify (G_OBJECT (button), "focus-on-click");
+ }
+}
+
+/**
+ * gtk_file_chooser_button_get_focus_on_click:
+ * @button: a #GtkFileChooserButton
+ *
+ * Returns whether the button grabs focus when it is clicked with the mouse.
+ * See gtk_file_chooser_button_set_focus_on_click().
+ *
+ * Return value: %TRUE if the button grabs focus when it is clicked with
+ * the mouse.
+ *
+ * Since: 2.10
+ **/
+gboolean
+gtk_file_chooser_button_get_focus_on_click (GtkFileChooserButton *button)
+{
+ g_return_val_if_fail (GTK_IS_FILE_CHOOSER_BUTTON (button), FALSE);
+
+ return button->priv->focus_on_click;
+}
+
#define __GTK_FILE_CHOOSER_BUTTON_C__
#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff