/* -*- Mode: C; c-file-style: "gnu"; tab-width: 8 -*- */
/* GTK+: gtkfilechooserbutton.c
- *
+ *
* Copyright (c) 2004 James M. Cape <jcape@ignore-your.tv>
*
* This library is free software; you can redistribute it and/or
GFile *current_folder_while_inactive;
gulong combo_box_changed_id;
- gulong dialog_file_activated_id;
gulong dialog_folder_changed_id;
gulong dialog_selection_changed_id;
gulong fs_volumes_changed_id;
/* Whether the next async callback from GIO should emit the "selection-changed" signal */
guint is_changing_selection : 1;
+
+ /* When GtkFileChooserButton's dialog is not active, any modifications to the
+ * dialog's state (as done by the calling program) will be reflected in the
+ * button immediately - the following two flags will be FALSE.
+ *
+ * But when the dialog is active, we only want the button to reflect
+ * modifications in the dialog's state if those modifications *are done by the
+ * calling program*, not by the user in the dialog. So if the program calls
+ * gtk_file_chooser_select_file() while the dialog is active, that state will
+ * need to be reflected in the button, and either of these flags will be TRUE.
+ * But if the user frobs the dialog, we don't want the button to change its
+ * state until the user actually confirms the dialog and dismisses it; in this
+ * case, the flags will be FALSE.
+ */
+ guint folder_change_needs_notification : 1;
+ guint selection_change_needs_notification : 1;
};
gpointer user_data);
static void dialog_selection_changed_cb (GtkFileChooser *dialog,
gpointer user_data);
-static void dialog_file_activated_cb (GtkFileChooser *dialog,
- gpointer user_data);
static void dialog_current_folder_changed_cb (GtkFileChooser *dialog,
gpointer user_data);
static void dialog_notify_cb (GObject *dialog,
/**
* GtkFileChooserButton:dialog:
- *
+ *
* Instance of the #GtkFileChooserDialog associated with the button.
*
* Since: 2.6
/**
* GtkFileChooserButton:focus-on-click:
- *
+ *
* Whether the #GtkFileChooserButton button grabs focus when it is clicked
* with the mouse.
*
P_("Whether the button grabs focus when it is clicked with the mouse"),
TRUE,
GTK_PARAM_READWRITE));
-
+
/**
* GtkFileChooserButton:title:
- *
+ *
* Title to put on the #GtkFileChooserDialog associated with the button.
*
* Since: 2.6
/**
* GtkFileChooserButton:width-chars:
- *
+ *
* The width of the entry and label inside the button, in characters.
*
* Since: 2.6
GTK_FILE_CHOOSER_DELEGATE_QUARK);
if (priv->active)
- return gtk_file_chooser_set_current_folder_file (delegate, file, error);
+ {
+ priv->folder_change_needs_notification = TRUE;
+ return gtk_file_chooser_set_current_folder_file (delegate, file, error);
+ }
else
{
if (priv->current_folder_while_inactive)
GTK_FILE_CHOOSER_DELEGATE_QUARK);
if (priv->active)
- return gtk_file_chooser_select_file (delegate, file, error);
+ {
+ priv->selection_change_needs_notification = TRUE;
+ return gtk_file_chooser_select_file (delegate, file, error);
+ }
else
{
if (priv->selection_while_inactive)
priv->dialog_folder_changed_id =
g_signal_connect (priv->dialog, "current-folder-changed",
G_CALLBACK (dialog_current_folder_changed_cb), object);
- priv->dialog_file_activated_id =
- g_signal_connect (priv->dialog, "file-activated",
- G_CALLBACK (dialog_file_activated_cb), object);
priv->dialog_selection_changed_id =
g_signal_connect (priv->dialog, "selection-changed",
G_CALLBACK (dialog_selection_changed_cb), object);
/* set up the action for a user-provided dialog, this also updates
* the label, image and combobox
*/
- g_object_set (object,
+ g_object_set (object,
"action", gtk_file_chooser_get_action (GTK_FILE_CHOOSER (priv->dialog)),
NULL);
struct DndSelectFolderData *info;
uris = gtk_selection_data_get_uris (data);
-
+
if (uris == NULL)
break;
width = MAX (width, gdk_pixbuf_get_width (pixbuf));
path = gtk_tree_row_reference_get_path (data->row_ref);
- if (path)
+ if (path)
{
gtk_tree_model_get_iter (data->button->priv->model, &iter, path);
gtk_tree_path_free (path);
{
GtkTreePath *path;
GCancellable *cancellable;
- struct ChangeIconThemeData *info;
-
+ struct ChangeIconThemeData *info;
+
info = g_new0 (struct ChangeIconThemeData, 1);
info->button = g_object_ref (button);
path = gtk_tree_model_get_path (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);
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",
+ pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote",
button->priv->icon_size, 0, NULL);
gtk_list_store_insert (store, &iter, pos);
pos++;
}
- if (button->priv->n_bookmarks > 0 &&
+ if (button->priv->n_bookmarks > 0 &&
!button->priv->has_bookmark_separator)
{
pos = model_get_type_position (button, ROW_TYPE_BOOKMARK_SEPARATOR);
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",
+ 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",
+ pixbuf = gtk_icon_theme_load_icon (icon_theme, "folder-remote",
button->priv->icon_size, 0, NULL);
gtk_list_store_set (store, &iter,
GtkListStore *store;
GtkTreeIter iter;
gint pos;
-
+
store = GTK_LIST_STORE (button->priv->model);
pos = model_get_type_position (button, ROW_TYPE_OTHER_SEPARATOR);
GtkListStore *store;
GtkTreeIter iter;
gint pos;
-
+
store = GTK_LIST_STORE (button->priv->model);
pos = model_get_type_position (button, ROW_TYPE_EMPTY_SELECTION);
{
GtkFileChooserButtonPrivate *priv = button->priv;
GtkTreeIter iter, filter_iter;
-
+
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);
TYPE_COLUMN, &type,
DATA_COLUMN, &data,
-1);
-
+
switch (type)
{
case ROW_TYPE_SPECIAL:
if (GTK_WINDOW (toplevel) != gtk_window_get_transient_for (GTK_WINDOW (priv->dialog)))
gtk_window_set_transient_for (GTK_WINDOW (priv->dialog),
GTK_WINDOW (toplevel));
-
+
gtk_window_set_modal (GTK_WINDOW (priv->dialog),
gtk_window_get_modal (GTK_WINDOW (toplevel)));
}
if (!priv->active)
{
- g_signal_handler_block (priv->dialog,
- priv->dialog_folder_changed_id);
- g_signal_handler_block (priv->dialog,
- priv->dialog_file_activated_id);
- g_signal_handler_block (priv->dialog,
- priv->dialog_selection_changed_id);
-
restore_inactive_state (button);
-
priv->active = TRUE;
}
}
/* Dialog */
+
static void
dialog_current_folder_changed_cb (GtkFileChooser *dialog,
gpointer user_data)
{
GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
+ GtkFileChooserButtonPrivate *priv = button->priv;
+ gboolean update_from_dialog;
- g_signal_emit_by_name (button, "current-folder-changed");
-}
+ if (!priv->active)
+ update_from_dialog = TRUE;
+ else if (priv->folder_change_needs_notification)
+ update_from_dialog = TRUE;
+ else
+ update_from_dialog = FALSE;
-static void
-dialog_file_activated_cb (GtkFileChooser *dialog,
- gpointer user_data)
-{
- g_signal_emit_by_name (user_data, "file-activated");
+ priv->folder_change_needs_notification = FALSE;
+
+ if (update_from_dialog)
+ {
+ save_inactive_state (button);
+
+ update_label_and_image (button);
+ update_combo_box (button);
+ g_signal_emit_by_name (button, "current-folder-changed");
+ }
}
static void
dialog_selection_changed_cb (GtkFileChooser *dialog,
gpointer user_data)
{
- update_label_and_image (user_data);
- update_combo_box (user_data);
- g_signal_emit_by_name (user_data, "selection-changed");
+ GtkFileChooserButton *button = GTK_FILE_CHOOSER_BUTTON (user_data);
+ GtkFileChooserButtonPrivate *priv = button->priv;
+ gboolean update_from_dialog;
+
+ if (!priv->active)
+ update_from_dialog = TRUE;
+ else if (priv->selection_change_needs_notification)
+ update_from_dialog = TRUE;
+ else
+ update_from_dialog = FALSE;
+
+ priv->selection_change_needs_notification = FALSE;
+
+ if (update_from_dialog)
+ {
+ save_inactive_state (button);
+
+ update_label_and_image (button);
+ update_combo_box (button);
+ g_signal_emit_by_name (button, "selection-changed");
+ }
}
static void
}
if (priv->active)
- {
- g_signal_handler_unblock (priv->dialog,
- priv->dialog_folder_changed_id);
- g_signal_handler_unblock (priv->dialog,
- priv->dialog_file_activated_id);
- g_signal_handler_unblock (priv->dialog,
- priv->dialog_selection_changed_id);
- priv->active = FALSE;
- }
+ priv->active = FALSE;
update_label_and_image (button);
update_combo_box (button);
* gtk_file_chooser_button_new:
* @title: the title of the browse dialog.
* @action: the open mode for the widget.
- *
+ *
* Creates a new file-selecting button widget.
- *
+ *
* Returns: a new button widget.
- *
+ *
* Since: 2.6
**/
GtkWidget *
* gtk_file_chooser_button_set_title:
* @button: the button widget to modify.
* @title: the new browse dialog title.
- *
+ *
* Modifies the @title of the browse dialog used by @button.
- *
+ *
* Since: 2.6
**/
void
/**
* gtk_file_chooser_button_get_title:
* @button: the button widget to examine.
- *
+ *
* Retrieves the title of the browse dialog used by @button. The returned value
* should not be modified or freed.
- *
+ *
* Returns: a pointer to the browse dialog's title.
- *
+ *
* Since: 2.6
**/
const gchar *
/**
* gtk_file_chooser_button_get_width_chars:
* @button: the button widget to examine.
- *
+ *
* Retrieves the width in characters of the @button widget's entry and/or label.
- *
+ *
* Returns: an integer width (in characters) that the button will use to size itself.
- *
+ *
* Since: 2.6
**/
gint
* gtk_file_chooser_button_set_width_chars:
* @button: the button widget to examine.
* @n_chars: the new width, in characters.
- *
+ *
* Sets the width (in characters) that @button will use to @n_chars.
- *
+ *
* Since: 2.6
**/
void
* 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
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().
*
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;
}
projects / ~andy / gtk / blobdiff