#include "gtkicontheme.h"
#include "gtkimage.h"
#include "gtkimagemenuitem.h"
+#include "gtkinfobar.h"
#include "gtklabel.h"
#include "gtkmarshalers.h"
#include "gtkmessagedialog.h"
#include "gtksizegroup.h"
#include "gtksizerequest.h"
#include "gtkstock.h"
-#include "gtktable.h"
+#include "gtkgrid.h"
#include "gtktoolbar.h"
#include "gtktoolbutton.h"
#include "gtktooltip.h"
#include <io.h>
#endif
+/* Values for GtkSelection-related "info" fields */
+#define SELECTION_TEXT 0
+#define SELECTION_URI 1
+
/* Profiling stuff */
#undef PROFILE_FILE_CHOOSER
#ifdef PROFILE_FILE_CHOOSER
#endif
#define PROFILE_INDENT 4
+
static int profile_indent;
static void
static gboolean gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed);
static void gtk_file_chooser_default_initial_focus (GtkFileChooserEmbed *chooser_embed);
+static void add_selection_to_recent_list (GtkFileChooserDefault *impl);
+
static void location_popup_handler (GtkFileChooserDefault *impl,
const gchar *path);
static void location_popup_on_paste_handler (GtkFileChooserDefault *impl);
static void stop_loading_and_clear_list_model (GtkFileChooserDefault *impl,
gboolean remove_from_treeview);
+
+static void search_setup_widgets (GtkFileChooserDefault *impl);
static void search_stop_searching (GtkFileChooserDefault *impl,
gboolean remove_query);
static void search_clear_model (GtkFileChooserDefault *impl,
gboolean remove_from_treeview);
static gboolean search_should_respond (GtkFileChooserDefault *impl);
-static void search_switch_to_browse_mode (GtkFileChooserDefault *impl);
static GSList *search_get_selected_files (GtkFileChooserDefault *impl);
static void search_entry_activate_cb (GtkEntry *entry,
gpointer data);
static void settings_load (GtkFileChooserDefault *impl);
+static void recent_start_loading (GtkFileChooserDefault *impl);
static void recent_stop_loading (GtkFileChooserDefault *impl);
static void recent_clear_model (GtkFileChooserDefault *impl,
gboolean remove_from_treeview);
static gboolean recent_should_respond (GtkFileChooserDefault *impl);
-static void recent_switch_to_browse_mode (GtkFileChooserDefault *impl);
static GSList * recent_get_selected_files (GtkFileChooserDefault *impl);
static void set_file_system_backend (GtkFileChooserDefault *impl);
static void unset_file_system_backend (GtkFileChooserDefault *impl);
const GError *error,
gpointer data)
{
- gint pos = -1;
gboolean cancelled = g_cancellable_is_cancelled (cancellable);
GdkPixbuf *pixbuf;
GtkTreePath *path;
/* Handle doesn't exist anymore in the model */
goto out;
- pos = gtk_tree_path_get_indices (path)[0];
gtk_tree_model_get_iter (GTK_TREE_MODEL (request->impl->shortcuts_model),
&iter, path);
gtk_tree_path_free (path);
/* Handles key press events on the file list, so that we can trap Enter to
* activate the default button on our own. Also, checks to see if '/' has been
- * pressed. See comment by tree_view_keybinding_cb() for more details.
+ * pressed.
*/
static gboolean
browse_files_key_press_event_cb (GtkWidget *widget,
impl->browse_files_popup_menu = NULL;
impl->browse_files_popup_menu_add_shortcut_item = NULL;
impl->browse_files_popup_menu_hidden_files_item = NULL;
+ impl->browse_files_popup_menu_copy_file_location_item = NULL;
}
/* Callback used when the "Add to Bookmarks" menu item is activated */
bookmarks_add_selected_folder (impl);
}
+/* callback used to set data to clipboard */
+static void
+copy_file_get_cb (GtkClipboard *clipboard,
+ GtkSelectionData *selection_data,
+ guint info,
+ gpointer data)
+{
+ GSList *selected_files = data;
+
+ if (selected_files)
+ {
+ gint num_files = g_slist_length (selected_files);
+ gchar **uris;
+ gint i;
+ GSList *l;
+
+ uris = g_new (gchar *, num_files + 1);
+ uris[num_files] = NULL; /* null terminator */
+
+ i = 0;
+
+ for (l = selected_files; l; l = l->next)
+ {
+ GFile *file = (GFile *) l->data;
+
+ if (info == SELECTION_URI)
+ uris[i] = g_file_get_uri (file);
+ else /* if (info == SELECTION_TEXT) - let this be the fallback */
+ uris[i] = g_file_get_parse_name (file);
+
+ i++;
+ }
+
+ if (info == SELECTION_URI)
+ gtk_selection_data_set_uris (selection_data, uris);
+ else /* if (info == SELECTION_TEXT) - let this be the fallback */
+ {
+ char *str = g_strjoinv (" ", uris);
+ gtk_selection_data_set_text (selection_data, str, -1);
+ g_free (str);
+ }
+
+ g_strfreev (uris);
+ }
+}
+
+/* callback used to clear the clipboard data */
+static void
+copy_file_clear_cb (GtkClipboard *clipboard,
+ gpointer data)
+{
+ GSList *selected_files = data;
+
+ g_slist_foreach (selected_files, (GFunc) g_object_unref, NULL);
+ g_slist_free (selected_files);
+}
+
+/* Callback used when the "Copy file's location" menu item is activated */
+static void
+copy_file_location_cb (GtkMenuItem *item,
+ GtkFileChooserDefault *impl)
+{
+ GSList *selected_files = NULL;
+
+ selected_files = search_get_selected_files (impl);
+
+ if (selected_files)
+ {
+ GtkClipboard *clipboard;
+ GtkTargetList *target_list;
+ GtkTargetEntry *targets;
+ int n_targets;
+
+ clipboard = gtk_widget_get_clipboard (GTK_WIDGET (impl), GDK_SELECTION_CLIPBOARD);
+
+ target_list = gtk_target_list_new (NULL, 0);
+ gtk_target_list_add_text_targets (target_list, SELECTION_TEXT);
+ gtk_target_list_add_uri_targets (target_list, SELECTION_URI);
+
+ targets = gtk_target_table_new_from_list (target_list, &n_targets);
+ gtk_target_list_unref (target_list);
+
+ gtk_clipboard_set_with_data (clipboard, targets, n_targets,
+ copy_file_get_cb,
+ copy_file_clear_cb,
+ selected_files);
+
+ gtk_target_table_free (targets, n_targets);
+ }
+}
+
/* Callback used when the "Show Hidden Files" menu item is toggled */
static void
show_hidden_toggled_cb (GtkCheckMenuItem *item,
return TRUE;
}
+/* Sensitizes the "Copy file's location" context menu item if there is actually
+ * a selection active.
+ */
+static void
+check_copy_file_location_sensitivity (GtkFileChooserDefault *impl)
+{
+ GtkTreeSelection *selection;
+ gboolean active;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
+ if (gtk_tree_selection_count_selected_rows (selection) == 0)
+ active = FALSE;
+ else
+ active = TRUE;
+
+ gtk_widget_set_sensitive (impl->browse_files_popup_menu_copy_file_location_item, active);
+}
+
/* Constructs the popup menu for the file list if needed */
static void
file_list_build_popup_menu (GtkFileChooserDefault *impl)
impl->browse_files_tree_view,
popup_menu_detach_cb);
+ item = gtk_image_menu_item_new_with_mnemonic (_("_Copy file's location"));
+ impl->browse_files_popup_menu_copy_file_location_item = item;
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
+ gtk_image_new_from_stock (GTK_STOCK_COPY, GTK_ICON_SIZE_MENU));
+ g_signal_connect (item, "activate",
+ G_CALLBACK (copy_file_location_cb), impl);
+ gtk_widget_show (item);
+ gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
+
item = gtk_image_menu_item_new_with_mnemonic (_("_Add to Bookmarks"));
impl->browse_files_popup_menu_add_shortcut_item = item;
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
gtk_menu_shell_append (GTK_MENU_SHELL (impl->browse_files_popup_menu), item);
bookmarks_check_add_sensitivity (impl);
+ check_copy_file_location_sensitivity (impl);
}
/* Updates the popup menu for the file list, creating it if necessary */
gint model_column;
} ColumnMap;
-/* Sets the sort column IDs for the file list based on the operation mode */
+/* Sets the sort column IDs for the file list; needs to be done whenever we
+ * change the model on the treeview.
+ */
static void
file_list_set_sort_column_ids (GtkFileChooserDefault *impl)
{
return swin;
}
-static GtkWidget *
-create_path_bar (GtkFileChooserDefault *impl)
-{
- GtkWidget *path_bar;
-
- path_bar = g_object_new (GTK_TYPE_PATH_BAR, NULL);
- _gtk_path_bar_set_file_system (GTK_PATH_BAR (path_bar), impl->file_system);
-
- return path_bar;
-}
-
/* Creates the widgets for the files/folders pane */
static GtkWidget *
file_pane_create (GtkFileChooserDefault *impl,
return vbox;
}
+static void
+location_entry_create (GtkFileChooserDefault *impl)
+{
+ if (!impl->location_entry)
+ impl->location_entry = _gtk_file_chooser_entry_new (TRUE);
+
+ _gtk_file_chooser_entry_set_file_system (GTK_FILE_CHOOSER_ENTRY (impl->location_entry),
+ impl->file_system);
+ _gtk_file_chooser_entry_set_local_only (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->local_only);
+ _gtk_file_chooser_entry_set_action (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->action);
+ gtk_entry_set_width_chars (GTK_ENTRY (impl->location_entry), 45);
+ gtk_entry_set_activates_default (GTK_ENTRY (impl->location_entry), TRUE);
+}
+
/* Creates the widgets specific to Save mode */
static void
save_widgets_create (GtkFileChooserDefault *impl)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
- impl->save_widgets_table = gtk_table_new (2, 2, FALSE);
+ impl->save_widgets_table = gtk_grid_new ();
gtk_box_pack_start (GTK_BOX (vbox), impl->save_widgets_table, FALSE, FALSE, 0);
gtk_widget_show (impl->save_widgets_table);
- gtk_table_set_row_spacings (GTK_TABLE (impl->save_widgets_table), 12);
- gtk_table_set_col_spacings (GTK_TABLE (impl->save_widgets_table), 12);
+ gtk_grid_set_row_spacing (GTK_GRID (impl->save_widgets_table), 12);
+ gtk_grid_set_column_spacing (GTK_GRID (impl->save_widgets_table), 12);
/* Label */
widget = gtk_label_new_with_mnemonic (_("_Name:"));
gtk_widget_set_halign (widget, GTK_ALIGN_START);
gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
- gtk_table_attach (GTK_TABLE (impl->save_widgets_table), widget,
- 0, 1, 0, 1,
- GTK_FILL, GTK_FILL,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (impl->save_widgets_table), widget, 0, 0, 1, 1);
gtk_widget_show (widget);
/* Location entry */
- impl->location_entry = _gtk_file_chooser_entry_new (TRUE);
- _gtk_file_chooser_entry_set_file_system (GTK_FILE_CHOOSER_ENTRY (impl->location_entry),
- impl->file_system);
- _gtk_file_chooser_entry_set_local_only (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->local_only);
- gtk_entry_set_width_chars (GTK_ENTRY (impl->location_entry), 45);
- gtk_entry_set_activates_default (GTK_ENTRY (impl->location_entry), TRUE);
- gtk_table_attach (GTK_TABLE (impl->save_widgets_table), impl->location_entry,
- 1, 2, 0, 1,
- GTK_EXPAND | GTK_FILL, 0,
- 0, 0);
+ location_entry_create (impl);
+ gtk_widget_set_hexpand (impl->location_entry, TRUE);
+ gtk_grid_attach (GTK_GRID (impl->save_widgets_table), impl->location_entry, 1, 0, 1, 1);
gtk_widget_show (impl->location_entry);
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), impl->location_entry);
impl->save_folder_label = gtk_label_new (NULL);
gtk_widget_set_halign (impl->save_folder_label, GTK_ALIGN_START);
gtk_widget_set_valign (impl->save_folder_label, GTK_ALIGN_CENTER);
- gtk_table_attach (GTK_TABLE (impl->save_widgets_table), impl->save_folder_label,
- 0, 1, 1, 2,
- GTK_FILL, GTK_FILL,
- 0, 0);
+ gtk_grid_attach (GTK_GRID (impl->save_widgets_table), impl->save_folder_label, 0, 1, 1, 1);
gtk_widget_show (impl->save_folder_label);
impl->save_widgets = vbox;
gtk_widget_hide (impl->location_entry_box);
}
-/* Sets the full path of the current folder as the text in the location entry. */
-static void
-location_entry_set_initial_text (GtkFileChooserDefault *impl)
-{
- gchar *text, *filename;
-
- if (!impl->current_folder)
- return;
-
- filename = g_file_get_path (impl->current_folder);
-
- if (filename)
- {
- text = g_filename_to_utf8 (filename, -1, NULL, NULL, NULL);
- g_free (filename);
- }
- else
- text = g_file_get_uri (impl->current_folder);
-
- if (text)
- {
- gboolean need_slash;
- int len;
-
- len = strlen (text);
- need_slash = (text[len - 1] != G_DIR_SEPARATOR);
-
- if (need_slash)
- {
- char *slash_text;
-
- slash_text = g_new (char, len + 2);
- strcpy (slash_text, text);
- slash_text[len] = G_DIR_SEPARATOR;
- slash_text[len + 1] = 0;
-
- g_free (text);
- text = slash_text;
- }
-
- _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), text);
- g_free (text);
- }
-
- g_free (filename);
-}
-
/* Turns on the location entry. Can be called even if we are already in that
* mode.
*/
return;
if (impl->location_entry)
- gtk_widget_destroy (impl->location_entry);
+ {
+ gtk_widget_destroy (impl->location_entry);
+ impl->location_entry = NULL;
+ }
/* Box */
/* Entry */
- impl->location_entry = _gtk_file_chooser_entry_new (TRUE);
- _gtk_file_chooser_entry_set_file_system (GTK_FILE_CHOOSER_ENTRY (impl->location_entry),
- impl->file_system);
- gtk_entry_set_activates_default (GTK_ENTRY (impl->location_entry), TRUE);
- _gtk_file_chooser_entry_set_action (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->action);
-
+ location_entry_create (impl);
gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_entry, TRUE, TRUE, 0);
gtk_label_set_mnemonic_widget (GTK_LABEL (impl->location_label), impl->location_entry);
/* Configure the entry */
_gtk_file_chooser_entry_set_base_folder (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->current_folder);
- _gtk_file_chooser_entry_set_local_only (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->local_only);
/* Done */
atk_object_set_name (gtk_widget_get_accessible (impl->location_button), str);
}
-/* Creates the main hpaned with the widgets shared by Open and Save mode */
+typedef enum {
+ PATH_BAR_FOLDER_PATH,
+ PATH_BAR_SELECT_A_FOLDER,
+ PATH_BAR_ERROR_NO_FILENAME,
+ PATH_BAR_ERROR_NO_FOLDER,
+ PATH_BAR_RECENTLY_USED,
+ PATH_BAR_SEARCH
+} PathBarMode;
+
+/* Creates the info bar for informational messages or warnings, with its icon and label */
static void
-browse_widgets_create (GtkFileChooserDefault *impl)
+info_bar_create (GtkFileChooserDefault *impl)
{
- GtkWidget *hpaned;
- GtkWidget *widget;
- GtkSizeGroup *size_group;
+ GtkWidget *content_area;
- /* size group is used by the scrolled windows of the panes */
- size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
- impl->browse_widgets_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+ impl->browse_select_a_folder_info_bar = gtk_info_bar_new ();
+ impl->browse_select_a_folder_icon = gtk_image_new_from_stock (GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU);
+ impl->browse_select_a_folder_label = gtk_label_new (NULL);
+
+ content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (impl->browse_select_a_folder_info_bar));
+
+ gtk_box_pack_start (GTK_BOX (content_area), impl->browse_select_a_folder_icon, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), impl->browse_select_a_folder_label, FALSE, FALSE, 0);
+
+ gtk_widget_show (impl->browse_select_a_folder_icon);
+ gtk_widget_show (impl->browse_select_a_folder_label);
+}
+
+/* Sets the info bar to show the appropriate informational or warning message */
+static void
+info_bar_set (GtkFileChooserDefault *impl, PathBarMode mode)
+{
+ char *str;
+ gboolean free_str;
+ GtkMessageType message_type;
+
+ free_str = FALSE;
+
+ switch (mode)
+ {
+ case PATH_BAR_SELECT_A_FOLDER:
+ str = g_strconcat ("<i>", _("Please select a folder below"), "</i>", NULL);
+ free_str = TRUE;
+ message_type = GTK_MESSAGE_OTHER;
+ break;
+
+ case PATH_BAR_ERROR_NO_FILENAME:
+ str = _("Please type a file name");
+ message_type = GTK_MESSAGE_WARNING;
+ break;
+
+ case PATH_BAR_ERROR_NO_FOLDER:
+ str = _("Please select a folder below");
+ message_type = GTK_MESSAGE_WARNING;
+ break;
+
+ default:
+ g_assert_not_reached ();
+ return;
+ }
+
+ gtk_info_bar_set_message_type (GTK_INFO_BAR (impl->browse_select_a_folder_info_bar), message_type);
+ gtk_image_set_from_stock (GTK_IMAGE (impl->browse_select_a_folder_icon),
+ (message_type == GTK_MESSAGE_WARNING) ? GTK_STOCK_DIALOG_WARNING : GTK_STOCK_DIRECTORY,
+ GTK_ICON_SIZE_MENU);
+ gtk_label_set_markup (GTK_LABEL (impl->browse_select_a_folder_label), str);
+
+ if (free_str)
+ g_free (str);
+}
+
+/* Creates the icon and label used to show that the file chooser is in Search or Recently-used mode */
+static void
+special_mode_widgets_create (GtkFileChooserDefault *impl)
+{
+ impl->browse_special_mode_icon = gtk_image_new ();
+ gtk_size_group_add_widget (impl->browse_path_bar_size_group, impl->browse_special_mode_icon);
+ gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->browse_special_mode_icon, FALSE, FALSE, 0);
+
+ impl->browse_special_mode_label = gtk_label_new (NULL);
+ gtk_size_group_add_widget (impl->browse_path_bar_size_group, impl->browse_special_mode_label);
+ gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->browse_special_mode_label, FALSE, FALSE, 0);
+}
+/* Creates the path bar's container and eveyrthing that goes in it: location button, pathbar, info bar, and Create Folder button */
+static void
+path_bar_widgets_create (GtkFileChooserDefault *impl)
+{
/* Location widgets - note browse_path_bar_hbox is packed in the right place until switch_path_bar() */
impl->browse_path_bar_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_widget_show (impl->browse_path_bar_hbox);
gtk_size_group_set_ignore_hidden (impl->browse_path_bar_size_group, FALSE);
/* Location button */
-
location_button_create (impl);
- gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->location_button, FALSE, FALSE, 0);
gtk_size_group_add_widget (impl->browse_path_bar_size_group, impl->location_button);
+ gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->location_button, FALSE, FALSE, 0);
/* Path bar */
-
- impl->browse_path_bar = create_path_bar (impl);
+ impl->browse_path_bar = g_object_new (GTK_TYPE_PATH_BAR, NULL);
+ _gtk_path_bar_set_file_system (GTK_PATH_BAR (impl->browse_path_bar), impl->file_system);
g_signal_connect (impl->browse_path_bar, "path-clicked", G_CALLBACK (path_bar_clicked), impl);
- gtk_widget_show_all (impl->browse_path_bar);
- gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->browse_path_bar, TRUE, TRUE, 0);
+
gtk_size_group_add_widget (impl->browse_path_bar_size_group, impl->browse_path_bar);
+ gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->browse_path_bar, TRUE, TRUE, 0);
+
+ /* Info bar */
+ info_bar_create (impl);
+ gtk_size_group_add_widget (impl->browse_path_bar_size_group, impl->browse_select_a_folder_info_bar);
+ gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->browse_select_a_folder_info_bar, TRUE, TRUE, 0);
+
+ /* Widgets for special modes (recently-used in Open mode, Search mode) */
+ special_mode_widgets_create (impl);
/* Create Folder */
impl->browse_new_folder_button = gtk_button_new_with_mnemonic (_("Create Fo_lder"));
g_signal_connect (impl->browse_new_folder_button, "clicked",
G_CALLBACK (new_folder_button_clicked), impl);
+ gtk_size_group_add_widget (impl->browse_path_bar_size_group, impl->browse_new_folder_button);
gtk_box_pack_end (GTK_BOX (impl->browse_path_bar_hbox), impl->browse_new_folder_button, FALSE, FALSE, 0);
+}
+
+/* Sets the path bar's mode to show a label, the actual folder path, or a
+ * warning message. You may call this function with PATH_BAR_ERROR_* directly
+ * if the pathbar is already showing the widgets you expect; otherwise, call
+ * path_bar_update() instead to set the appropriate widgets automatically.
+ */
+static void
+path_bar_set_mode (GtkFileChooserDefault *impl, PathBarMode mode)
+{
+ gboolean path_bar_visible = FALSE;
+ gboolean special_mode_widgets_visible = FALSE;
+ gboolean info_bar_visible = FALSE;
+ gboolean create_folder_visible = FALSE;
+
+ char *tmp;
+
+ switch (mode)
+ {
+ case PATH_BAR_FOLDER_PATH:
+ path_bar_visible = TRUE;
+ break;
+
+ case PATH_BAR_SELECT_A_FOLDER:
+ case PATH_BAR_ERROR_NO_FILENAME:
+ case PATH_BAR_ERROR_NO_FOLDER:
+ info_bar_set (impl, mode);
+ info_bar_visible = TRUE;
+ break;
+
+ case PATH_BAR_RECENTLY_USED:
+ gtk_image_set_from_icon_name (GTK_IMAGE (impl->browse_special_mode_icon), "document-open-recent", GTK_ICON_SIZE_BUTTON);
+
+ tmp = g_strdup_printf ("<b>%s</b>", _("Recently Used"));
+ gtk_label_set_markup (GTK_LABEL (impl->browse_special_mode_label), tmp);
+ g_free (tmp);
+
+ special_mode_widgets_visible = TRUE;
+ break;
+
+ case PATH_BAR_SEARCH:
+ gtk_image_set_from_stock (GTK_IMAGE (impl->browse_special_mode_icon), GTK_STOCK_FIND, GTK_ICON_SIZE_BUTTON);
+
+ tmp = g_strdup_printf ("<b>%s</b>", _("Search:"));
+ gtk_label_set_markup (GTK_LABEL (impl->browse_special_mode_label), tmp);
+ g_free (tmp);
+
+ special_mode_widgets_visible = TRUE;
+ break;
+
+ default:
+ g_assert_not_reached ();
+ }
+
+ gtk_widget_set_visible (impl->browse_path_bar, path_bar_visible);
+ gtk_widget_set_visible (impl->browse_special_mode_icon, special_mode_widgets_visible);
+ gtk_widget_set_visible (impl->browse_special_mode_label, special_mode_widgets_visible);
+ gtk_widget_set_visible (impl->browse_select_a_folder_info_bar, info_bar_visible);
+
+ if (path_bar_visible)
+ {
+ if (impl->create_folders
+ && impl->action != GTK_FILE_CHOOSER_ACTION_OPEN
+ && impl->operation_mode != OPERATION_MODE_RECENT)
+ create_folder_visible = TRUE;
+ }
+
+ gtk_widget_set_visible (impl->browse_new_folder_button, create_folder_visible);
+}
+
+/* Creates the main hpaned with the widgets shared by Open and Save mode */
+static void
+browse_widgets_create (GtkFileChooserDefault *impl)
+{
+ GtkWidget *hpaned;
+ GtkWidget *widget;
+ GtkSizeGroup *size_group;
+
+ impl->browse_widgets_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+ gtk_box_pack_start (GTK_BOX (impl), impl->browse_widgets_box, TRUE, TRUE, 0);
+ gtk_widget_show (impl->browse_widgets_box);
+
+ impl->browse_header_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+ gtk_box_pack_start (GTK_BOX (impl->browse_widgets_box), impl->browse_header_box, FALSE, FALSE, 0);
+ gtk_widget_show (impl->browse_header_box);
+
+ /* Path bar, info bar, and their respective machinery - the browse_path_bar_hbox will get packed elsewhere */
+ path_bar_widgets_create (impl);
/* Box for the location label and entry */
impl->location_entry_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
- gtk_box_pack_start (GTK_BOX (impl->browse_widgets_box), impl->location_entry_box, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (impl->browse_header_box), impl->location_entry_box, FALSE, FALSE, 0);
impl->location_label = gtk_label_new_with_mnemonic (_("_Location:"));
gtk_widget_show (impl->location_label);
gtk_box_pack_start (GTK_BOX (impl->location_entry_box), impl->location_label, FALSE, FALSE, 0);
+ /* size group is used by the scrolled windows of the panes */
+ size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
+
/* Paned widget */
hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
/* The browse widgets */
browse_widgets_create (impl);
- gtk_box_pack_start (GTK_BOX (impl), impl->browse_widgets_box, TRUE, TRUE, 0);
/* Alignment to hold extra widget */
impl->extra_align = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN
|| impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
{
- gtk_box_pack_start (GTK_BOX (impl->browse_widgets_box), impl->browse_path_bar_hbox, FALSE, FALSE, 0);
- gtk_box_reorder_child (GTK_BOX (impl->browse_widgets_box), impl->browse_path_bar_hbox, 0);
+ gtk_box_pack_start (GTK_BOX (impl->browse_header_box), impl->browse_path_bar_hbox, FALSE, FALSE, 0);
+ gtk_box_reorder_child (GTK_BOX (impl->browse_header_box), impl->browse_path_bar_hbox, 0);
}
else if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
{
- gtk_table_attach (GTK_TABLE (impl->save_widgets_table), impl->browse_path_bar_hbox,
- 1, 2, 1, 2,
- GTK_EXPAND | GTK_FILL, GTK_FILL,
- 0, 0);
+ gtk_widget_set_hexpand (impl->browse_path_bar_hbox, TRUE);
+ gtk_grid_attach (GTK_GRID (impl->save_widgets_table), impl->browse_path_bar_hbox, 1, 1, 1, 1);
gtk_label_set_mnemonic_widget (GTK_LABEL (impl->save_folder_label), impl->browse_path_bar);
}
else
g_object_unref (impl->browse_path_bar_hbox);
}
-/* This function is basically a do_all function.
- *
- * It sets the visibility on all the widgets based on the current state, and
- * moves the custom_widget if needed.
+/* Takes the folder stored in a row in the recent_model, and puts it in the pathbar */
+static void
+put_recent_folder_in_pathbar (GtkFileChooserDefault *impl, GtkTreeIter *iter)
+{
+ GFile *file;
+
+ gtk_tree_model_get (GTK_TREE_MODEL (impl->recent_model), iter,
+ MODEL_COL_FILE, &file,
+ -1);
+ _gtk_path_bar_set_file (GTK_PATH_BAR (impl->browse_path_bar), file, FALSE, NULL); /* NULL-GError */
+ g_object_unref (file);
+}
+
+/* Sets the pathbar in the appropriate mode according to the current operation mode and action. This is the central function for
+ * dealing with the pathbar's widgets; as long as impl->action and impl->operation_mode are set correctly, then calling this
+ * function will update all the pathbar's widgets.
*/
static void
-update_appearance (GtkFileChooserDefault *impl)
+path_bar_update (GtkFileChooserDefault *impl)
{
- save_path_bar (impl);
+ PathBarMode mode;
- if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE ||
- impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+ switch (impl->operation_mode)
{
- const char *text;
-
- gtk_widget_hide (impl->location_button);
- save_widgets_create (impl);
+ case OPERATION_MODE_BROWSE:
+ mode = PATH_BAR_FOLDER_PATH;
+ break;
+ case OPERATION_MODE_RECENT:
if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
- text = _("Save in _folder:");
- else
- text = _("Create in _folder:");
+ {
+ GtkTreeSelection *selection;
+ gboolean have_selected;
+ GtkTreeIter iter;
- gtk_label_set_text_with_mnemonic (GTK_LABEL (impl->save_folder_label), text);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_files_tree_view));
- if (impl->select_multiple)
- {
- g_warning ("Save mode cannot be set in conjunction with multiple selection mode. "
- "Re-setting to single selection mode.");
- set_select_multiple (impl, FALSE, TRUE);
- }
- }
- else if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
- impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
- {
- gtk_widget_show (impl->location_button);
- save_widgets_destroy (impl);
- gtk_widget_show (impl->browse_widgets_box);
- location_mode_set (impl, impl->location_mode, TRUE);
- }
+ /* Save mode means single-selection mode, so the following is valid */
+ have_selected = gtk_tree_selection_get_selected (selection, NULL, &iter);
+
+ if (have_selected)
+ {
+ mode = PATH_BAR_FOLDER_PATH;
+ put_recent_folder_in_pathbar (impl, &iter);
+ }
+ else
+ mode = PATH_BAR_SELECT_A_FOLDER;
+ }
+ else
+ mode = PATH_BAR_RECENTLY_USED;
+
+ break;
+
+ case OPERATION_MODE_SEARCH:
+ mode = PATH_BAR_SEARCH;
+ break;
+
+ default:
+ g_assert_not_reached ();
+ return;
+ }
+
+ path_bar_set_mode (impl, mode);
+}
+
+static void
+operation_mode_discard_search_widgets (GtkFileChooserDefault *impl)
+{
+ if (impl->search_hbox)
+ {
+ gtk_widget_destroy (impl->search_hbox);
+
+ impl->search_hbox = NULL;
+ impl->search_entry = NULL;
+ }
+}
+
+/* Stops running operations like populating the browse model, searches, and the recent-files model */
+static void
+operation_mode_stop (GtkFileChooserDefault *impl, OperationMode mode)
+{
+ switch (mode)
+ {
+ case OPERATION_MODE_BROWSE:
+ stop_loading_and_clear_list_model (impl, TRUE);
+ break;
+
+ case OPERATION_MODE_SEARCH:
+ search_stop_searching (impl, FALSE);
+ search_clear_model (impl, TRUE);
+
+ operation_mode_discard_search_widgets (impl);
+ break;
+
+ case OPERATION_MODE_RECENT:
+ recent_stop_loading (impl);
+ recent_clear_model (impl, TRUE);
+ break;
+
+ default:
+ g_assert_not_reached ();
+ }
+}
+
+static void
+operation_mode_set_browse (GtkFileChooserDefault *impl)
+{
+ path_bar_update (impl);
+
+ if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
+ impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+ {
+ gtk_widget_show (impl->location_button);
+ location_mode_set (impl, impl->location_mode, TRUE);
+
+ if (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY)
+ gtk_widget_show (impl->location_entry_box);
+ }
+}
+
+static void
+operation_mode_set_search (GtkFileChooserDefault *impl)
+{
+ g_assert (impl->search_hbox == NULL);
+ g_assert (impl->search_entry == NULL);
+ g_assert (impl->search_model == NULL);
+
+ search_setup_widgets (impl);
+}
+
+static void
+operation_mode_set_recent (GtkFileChooserDefault *impl)
+{
+ path_bar_update (impl);
+
+ /* Hide the location widgets temporarily */
+ if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
+ impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+ {
+ gtk_widget_hide (impl->location_button);
+ gtk_widget_hide (impl->location_entry_box);
+ }
+
+ recent_start_loading (impl);
+}
+
+/* Sometimes we need to frob the selection in the shortcuts list manually */
+static void
+shortcuts_select_item_without_activating (GtkFileChooserDefault *impl, int pos)
+{
+ GtkTreeSelection *selection;
+ GtkTreePath *path;
+
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));
+
+ g_signal_handlers_block_by_func (selection, G_CALLBACK (shortcuts_selection_changed_cb), impl);
+
+ path = gtk_tree_path_new_from_indices (pos, -1);
+ gtk_tree_selection_select_path (selection, path);
+ gtk_tree_path_free (path);
+
+ g_signal_handlers_unblock_by_func (selection, G_CALLBACK (shortcuts_selection_changed_cb), impl);
+}
+
+static void
+operation_mode_set (GtkFileChooserDefault *impl, OperationMode mode)
+{
+ ShortcutsIndex shortcut_to_select;
+
+ operation_mode_stop (impl, impl->operation_mode);
+
+ impl->operation_mode = mode;
+
+ switch (impl->operation_mode)
+ {
+ case OPERATION_MODE_BROWSE:
+ operation_mode_set_browse (impl);
+ shortcut_to_select = SHORTCUTS_CURRENT_FOLDER;
+ break;
+
+ case OPERATION_MODE_SEARCH:
+ operation_mode_set_search (impl);
+ shortcut_to_select = SHORTCUTS_SEARCH;
+ break;
+
+ case OPERATION_MODE_RECENT:
+ operation_mode_set_recent (impl);
+ shortcut_to_select = SHORTCUTS_RECENT;
+ break;
+
+ default:
+ g_assert_not_reached ();
+ return;
+ }
+
+ if (shortcut_to_select != SHORTCUTS_CURRENT_FOLDER)
+ shortcuts_select_item_without_activating (impl, shortcuts_get_index (impl, shortcut_to_select));
+}
+
+/* This function is basically a do_all function.
+ *
+ * It sets the visibility on all the widgets based on the current state, and
+ * moves the custom_widget if needed.
+ */
+static void
+update_appearance (GtkFileChooserDefault *impl)
+{
+ save_path_bar (impl);
+
+ if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE ||
+ impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
+ {
+ const char *text;
+
+ gtk_widget_hide (impl->location_button);
+ save_widgets_create (impl);
+
+ if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
+ text = _("Save in _folder:");
+ else
+ text = _("Create in _folder:");
+
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (impl->save_folder_label), text);
+
+ if (impl->select_multiple)
+ {
+ g_warning ("Save mode cannot be set in conjunction with multiple selection mode. "
+ "Re-setting to single selection mode.");
+ set_select_multiple (impl, FALSE, TRUE);
+ }
+ }
+ else if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
+ impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
+ {
+ gtk_widget_show (impl->location_button);
+ save_widgets_destroy (impl);
+ location_mode_set (impl, impl->location_mode, TRUE);
+ }
if (impl->location_entry)
_gtk_file_chooser_entry_set_action (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), impl->action);
restore_path_bar (impl);
-
- if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN || !impl->create_folders)
- gtk_widget_hide (impl->browse_new_folder_button);
- else
- gtk_widget_show (impl->browse_new_folder_button);
+ path_bar_update (impl);
/* This *is* needed; we need to redraw the file list because the "sensitivity"
* of files may change depending whether we are in a file or folder-only mode.
gtk_tree_view_columns_autosize (GTK_TREE_VIEW (impl->browse_files_tree_view));
gtk_tree_view_set_search_column (GTK_TREE_VIEW (impl->browse_files_tree_view),
MODEL_COL_NAME);
+ file_list_set_sort_column_ids (impl);
set_sort_column (impl);
profile_msg (" gtk_tree_view_set_model end", NULL);
impl->list_sort_ascending = TRUE;
if (info == NULL || _gtk_file_info_consider_as_directory (info))
g_value_set_string (value, NULL);
else
- g_value_take_string (value, g_format_size_for_display (g_file_info_get_size (info)));
+ g_value_take_string (value, g_format_size (g_file_info_get_size (info)));
break;
case MODEL_COL_MTIME:
case MODEL_COL_MTIME_TEXT:
/* no need to update the file chooser's entry if there's no entry */
if (impl->operation_mode == OPERATION_MODE_SEARCH ||
- impl->operation_mode == OPERATION_MODE_RECENT ||
!impl->location_entry)
return;
if (closure.num_selected == 0)
{
- goto maybe_clear_entry;
+ if (impl->operation_mode == OPERATION_MODE_RECENT)
+ _gtk_file_chooser_entry_set_base_folder (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), NULL);
+ else
+ goto maybe_clear_entry;
}
else if (closure.num_selected == 1)
{
return;
}
+ else if (impl->operation_mode == OPERATION_MODE_RECENT
+ && impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
+ {
+ GFile *folder;
+
+ /* Set the base folder on the name entry, so it will do completion relative to the correct recent-folder */
+
+ gtk_tree_model_get (GTK_TREE_MODEL (impl->recent_model), &closure.first_selected_iter,
+ MODEL_COL_FILE, &folder,
+ -1);
+ _gtk_file_chooser_entry_set_base_folder (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), folder);
+ g_object_unref (folder);
+ return;
+ }
}
else
{
g_object_ref (file);
- switch (impl->operation_mode)
- {
- case OPERATION_MODE_SEARCH:
- search_switch_to_browse_mode (impl);
- break;
- case OPERATION_MODE_RECENT:
- recent_switch_to_browse_mode (impl);
- break;
- case OPERATION_MODE_BROWSE:
- break;
- }
+ operation_mode_set (impl, OPERATION_MODE_BROWSE);
if (impl->local_only && !g_file_is_native (file))
{
GtkWidget *current_focus;
gboolean file_list_seen;
+ info.impl = impl;
+ info.result = NULL;
+ info.file_from_entry = NULL;
+
if (impl->operation_mode == OPERATION_MODE_SEARCH)
return search_get_selected_files (impl);
if (impl->operation_mode == OPERATION_MODE_RECENT)
- return recent_get_selected_files (impl);
-
- info.impl = impl;
- info.result = NULL;
- info.file_from_entry = NULL;
+ {
+ if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
+ {
+ file_list_seen = TRUE;
+ goto file_entry;
+ }
+ else
+ return recent_get_selected_files (impl);
+ }
toplevel = get_toplevel (GTK_WIDGET (impl));
if (toplevel)
gchar *file_part;
};
+/* Every time we request a response explicitly, we need to save the selection to the recently-used list,
+ * as requesting a response means, "the dialog is confirmed".
+ */
+static void
+request_response_and_add_to_recent_list (GtkFileChooserDefault *impl)
+{
+ g_signal_emit_by_name (impl, "response-requested");
+ add_selection_to_recent_list (impl);
+}
+
static void
confirmation_confirm_get_info_cb (GCancellable *cancellable,
GFileInfo *info,
set_busy_cursor (data->impl, FALSE);
if (should_respond)
- g_signal_emit_by_name (data->impl, "response-requested");
+ request_response_and_add_to_recent_list (data->impl);
out:
g_object_unref (data->impl);
{
if (data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
{
- g_signal_emit_by_name (data->impl, "response-requested"); /* even if the file doesn't exist, apps can make good use of that (e.g. Emacs) */
+ request_response_and_add_to_recent_list (data->impl); /* even if the file doesn't exist, apps can make good use of that (e.g. Emacs) */
}
else if (data->impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
{
g_free (file_part);
if (retval)
- g_signal_emit_by_name (data->impl, "response-requested");
+ request_response_and_add_to_recent_list (data->impl);
}
else
- g_signal_emit_by_name (data->impl, "response-requested");
+ request_response_and_add_to_recent_list (data->impl);
}
else if (data->impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
|| data->impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
set_busy_cursor (data->impl, FALSE);
if (!mkdir_error)
- g_signal_emit_by_name (data->impl, "response-requested");
+ request_response_and_add_to_recent_list (data->impl);
else
error_creating_folder_dialog (data->impl, data->file, mkdir_error);
}
else
{
if (file_exists)
- g_signal_emit_by_name (data->impl, "response-requested"); /* user typed an existing filename; we are done */
+ request_response_and_add_to_recent_list (data->impl); /* user typed an existing filename; we are done */
else
needs_parent_check = TRUE; /* file doesn't exist; see if its parent exists */
}
if (is_folder)
{
/* User typed a folder; we are done */
- g_signal_emit_by_name (data->impl, "response-requested");
+ request_response_and_add_to_recent_list (data->impl);
}
else
error_selecting_folder_over_existing_file_dialog (data->impl, data->file);
impl);
}
-
/* Implementation for GtkFileChooserEmbed::should_respond() */
+static void
+add_selection_to_recent_list (GtkFileChooserDefault *impl)
+{
+ GSList *files;
+ GSList *l;
+
+ files = gtk_file_chooser_default_get_files (GTK_FILE_CHOOSER (impl));
+
+ for (l = files; l; l = l->next)
+ {
+ GFile *file = l->data;
+ char *uri;
+
+ uri = g_file_get_uri (file);
+ if (uri)
+ {
+ gtk_recent_manager_add_item (impl->recent_manager, uri);
+ g_free (uri);
+ }
+ }
+
+ g_slist_foreach (files, (GFunc) g_object_unref, NULL);
+ g_slist_free (files);
+}
+
static gboolean
gtk_file_chooser_default_should_respond (GtkFileChooserEmbed *chooser_embed)
{
GtkFileChooserDefault *impl;
GtkWidget *toplevel;
GtkWidget *current_focus;
+ gboolean retval;
impl = GTK_FILE_CHOOSER_DEFAULT (chooser_embed);
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (impl));
g_assert (GTK_IS_WINDOW (toplevel));
+ retval = FALSE;
+
current_focus = gtk_window_get_focus (GTK_WINDOW (toplevel));
if (current_focus == impl->browse_files_tree_view)
g_assert (impl->action >= GTK_FILE_CHOOSER_ACTION_OPEN && impl->action <= GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER);
if (impl->operation_mode == OPERATION_MODE_SEARCH)
- return search_should_respond (impl);
+ {
+ retval = search_should_respond (impl);
+ goto out;
+ }
if (impl->operation_mode == OPERATION_MODE_RECENT)
- return recent_should_respond (impl);
+ {
+ if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
+ goto save_entry;
+ else
+ {
+ retval = recent_should_respond (impl);
+ goto out;
+ }
+ }
selection_check (impl, &num_selected, &all_files, &all_folders);
return FALSE;
case RESPOND:
- return TRUE;
+ retval = TRUE;
+ goto out;
case RESPOND_OR_SWITCH:
g_assert (num_selected == 1);
return FALSE;
}
else if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
- return should_respond_after_confirm_overwrite (impl,
- get_display_name_from_file_list (impl),
- impl->current_folder);
+ {
+ retval = should_respond_after_confirm_overwrite (impl,
+ get_display_name_from_file_list (impl),
+ impl->current_folder);
+ goto out;
+ }
else
- return TRUE;
+ {
+ retval = TRUE;
+ goto out;
+ }
case ALL_FILES:
- return all_files;
+ retval = all_files;
+ goto out;
case ALL_FOLDERS:
- return all_folders;
+ retval = all_folders;
+ goto out;
case SAVE_ENTRY:
goto save_entry;
GFile *file;
gboolean is_well_formed, is_empty, is_file_part_empty;
gboolean is_folder;
- gboolean retval;
GtkFileChooserEntry *entry;
GError *error;
check_save_entry (impl, &file, &is_well_formed, &is_empty, &is_file_part_empty, &is_folder);
if (!is_well_formed)
- return FALSE;
+ {
+ if (!is_empty
+ && impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
+ && impl->operation_mode == OPERATION_MODE_RECENT)
+ {
+ path_bar_set_mode (impl, PATH_BAR_ERROR_NO_FOLDER);
+#if 0
+ /* We'll #ifdef this out, as the fucking treeview selects its first row,
+ * thus changing our assumption that no selection is present - setting
+ * a selection causes the error message from path_bar_set_mode() to go away,
+ * but we want the user to see that message!
+ */
+ gtk_widget_grab_focus (impl->browse_files_tree_view);
+#endif
+ }
+ /* FIXME: else show an "invalid filename" error as the pathbar mode? */
+
+ return FALSE;
+ }
if (is_empty)
{
if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
- return FALSE;
+ {
+ path_bar_set_mode (impl, PATH_BAR_ERROR_NO_FILENAME);
+ gtk_widget_grab_focus (impl->location_entry);
+ return FALSE;
+ }
goto file_list;
}
impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
{
change_folder_and_display_error (impl, file, TRUE);
- retval = FALSE;
}
else if (impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
else
{
g_assert_not_reached ();
- retval = FALSE;
}
}
else
data);
set_busy_cursor (impl, TRUE);
- retval = FALSE;
if (error != NULL)
g_error_free (error);
}
g_object_unref (file);
- return retval;
}
else if (impl->toplevel_last_focus_widget == impl->browse_files_tree_view)
{
goto save_entry;
else
goto file_list;
-
- g_assert_not_reached ();
- return FALSE;
+
+ out:
+
+ if (retval)
+ add_selection_to_recent_list (impl);
+
+ return retval;
}
/* Implementation for GtkFileChooserEmbed::initial_focus() */
*/
gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view),
GTK_TREE_MODEL (impl->search_model));
+ file_list_set_sort_column_ids (impl);
#endif
/* FMQ: if search was empty, say that we got no hits */
}
}
-/* Stops any pending searches, clears the file list, and switches back to OPERATION_MODE_BROWSE */
-static void
-search_switch_to_browse_mode (GtkFileChooserDefault *impl)
-{
- g_assert (impl->operation_mode != OPERATION_MODE_BROWSE);
-
- search_stop_searching (impl, FALSE);
- search_clear_model (impl, TRUE);
-
- gtk_widget_destroy (impl->search_hbox);
- impl->search_hbox = NULL;
- impl->search_entry = NULL;
-
- gtk_widget_show (impl->browse_path_bar);
- if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN || !impl->create_folders)
- gtk_widget_hide (impl->browse_new_folder_button);
- else
- gtk_widget_show (impl->browse_new_folder_button);
-
-
- if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
- impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
- {
- gtk_widget_show (impl->location_button);
-
- if (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY)
- gtk_widget_show (impl->location_entry_box);
- }
-
- impl->operation_mode = OPERATION_MODE_BROWSE;
-
- file_list_set_sort_column_ids (impl);
-}
-
/* Creates the search_model and puts it in the tree view */
static void
search_setup_model (GtkFileChooserDefault *impl)
*/
gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view),
GTK_TREE_MODEL (impl->search_model));
+ file_list_set_sort_column_ids (impl);
}
/* Creates a new query with the specified text and launches it */
static void
search_setup_widgets (GtkFileChooserDefault *impl)
{
- GtkWidget *label;
- GtkWidget *image;
- gchar *tmp;
-
impl->search_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
- /* Image */
-
- image = gtk_image_new_from_stock (GTK_STOCK_FIND, GTK_ICON_SIZE_BUTTON);
- gtk_box_pack_start (GTK_BOX (impl->search_hbox), image, FALSE, FALSE, 5);
-
- /* Label */
-
- label = gtk_label_new (NULL);
- tmp = g_strdup_printf ("<b>%s</b>", _("Search:"));
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), tmp);
- gtk_box_pack_start (GTK_BOX (impl->search_hbox), label, FALSE, FALSE, 0);
- g_free (tmp);
-
- /* Entry */
+ path_bar_update (impl);
impl->search_entry = gtk_entry_new ();
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), impl->search_entry);
g_signal_connect (impl->search_entry, "activate",
G_CALLBACK (search_entry_activate_cb),
impl);
}
}
- gtk_widget_hide (impl->browse_path_bar);
- gtk_widget_hide (impl->browse_new_folder_button);
-
/* Box for search widgets */
gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->search_hbox, TRUE, TRUE, 0);
gtk_widget_show_all (impl->search_hbox);
/* FMQ: hide the filter combo? */
}
-/* Stops running operations like populating the browse model, searches, and the recent-files model */
-static void
-stop_operation (GtkFileChooserDefault *impl, OperationMode mode)
-{
- switch (mode)
- {
- case OPERATION_MODE_BROWSE:
- stop_loading_and_clear_list_model (impl, TRUE);
- break;
-
- case OPERATION_MODE_SEARCH:
- search_stop_searching (impl, FALSE);
- search_clear_model (impl, TRUE);
-
- gtk_widget_destroy (impl->search_hbox);
- impl->search_hbox = NULL;
- impl->search_entry = NULL;
- break;
-
- case OPERATION_MODE_RECENT:
- recent_stop_loading (impl);
- recent_clear_model (impl, TRUE);
-
- gtk_widget_destroy (impl->recent_hbox);
- impl->recent_hbox = NULL;
- break;
- }
-}
-
-/* Main entry point to the searching functions; this gets called when the user
- * activates the Search shortcut.
- */
-static void
-search_activate (GtkFileChooserDefault *impl)
-{
- OperationMode previous_mode;
-
- if (impl->operation_mode == OPERATION_MODE_SEARCH)
- {
- focus_search_entry_in_idle (impl);
- return;
- }
-
- previous_mode = impl->operation_mode;
- impl->operation_mode = OPERATION_MODE_SEARCH;
-
- stop_operation (impl, previous_mode);
-
- g_assert (impl->search_hbox == NULL);
- g_assert (impl->search_entry == NULL);
- g_assert (impl->search_model == NULL);
-
- search_setup_widgets (impl);
- file_list_set_sort_column_ids (impl);
-}
-
/*
* Recent files support
*/
}
}
-/* Stops any pending load, clears the file list, and switches
- * back to OPERATION_MODE_BROWSE
- */
-static void
-recent_switch_to_browse_mode (GtkFileChooserDefault *impl)
-{
- g_assert (impl->operation_mode != OPERATION_MODE_BROWSE);
-
- recent_stop_loading (impl);
- recent_clear_model (impl, TRUE);
-
- gtk_widget_destroy (impl->recent_hbox);
- impl->recent_hbox = NULL;
-
- gtk_widget_show (impl->browse_path_bar);
- if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN || !impl->create_folders)
- gtk_widget_hide (impl->browse_new_folder_button);
- else
- gtk_widget_show (impl->browse_new_folder_button);
-
- if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
- impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
- {
- gtk_widget_show (impl->location_button);
-
- if (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY)
- gtk_widget_show (impl->location_entry_box);
- }
-
- gtk_tree_view_column_set_visible (impl->list_size_column, impl->show_size_column);
-
- impl->operation_mode = OPERATION_MODE_BROWSE;
-
- file_list_set_sort_column_ids (impl);
-}
-
static void
recent_setup_model (GtkFileChooserDefault *impl)
{
{
GtkFileChooserDefault *impl;
GList *items;
- gint n_items;
- gint n_loaded_items;
- guint needs_sorting : 1;
} RecentLoadData;
static void
gtk_tree_view_set_model (GTK_TREE_VIEW (impl->browse_files_tree_view),
GTK_TREE_MODEL (impl->recent_model));
+ file_list_set_sort_column_ids (impl);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (impl->recent_model), MODEL_COL_MTIME, GTK_SORT_DESCENDING);
set_busy_cursor (impl, FALSE);
impl->load_recent_id = 0;
- if (load_data->items)
- {
- g_list_foreach (load_data->items, (GFunc) gtk_recent_info_unref, NULL);
- g_list_free (load_data->items);
- }
-
g_free (load_data);
}
-static gint
-recent_sort_mru (gconstpointer a,
- gconstpointer b)
-{
- GtkRecentInfo *info_a = (GtkRecentInfo *) a;
- GtkRecentInfo *info_b = (GtkRecentInfo *) b;
-
- return (gtk_recent_info_get_modified (info_b) - gtk_recent_info_get_modified (info_a));
-}
-
static gint
get_recent_files_limit (GtkWidget *widget)
{
return limit;
}
-static gboolean
-recent_idle_load (gpointer data)
+/* Populates the file system model with the GtkRecentInfo* items in the provided list; frees the items */
+static void
+populate_model_with_recent_items (GtkFileChooserDefault *impl, GList *items)
{
- RecentLoadData *load_data = data;
- GtkFileChooserDefault *impl = load_data->impl;
- GList *walk;
- GFile *file;
+ gint limit;
+ GList *l;
+ int n;
- if (!impl->recent_manager)
- return FALSE;
+ limit = get_recent_files_limit (GTK_WIDGET (impl));
- /* first iteration: load all the items */
- if (!load_data->items)
+ n = 0;
+
+ for (l = items; l; l = l->next)
{
- load_data->items = gtk_recent_manager_get_items (impl->recent_manager);
- if (!load_data->items)
- return FALSE;
+ GtkRecentInfo *info = l->data;
+ GFile *file;
- load_data->needs_sorting = TRUE;
+ file = g_file_new_for_uri (gtk_recent_info_get_uri (info));
+ _gtk_file_system_model_add_and_query_file (impl->recent_model,
+ file,
+ MODEL_ATTRIBUTES);
+ g_object_unref (file);
- return TRUE;
+ n++;
+ if (limit != -1 && n >= limit)
+ break;
}
-
- /* second iteration: preliminary MRU sorting and clamping */
- if (load_data->needs_sorting)
- {
- gint limit;
+}
- load_data->items = g_list_sort (load_data->items, recent_sort_mru);
- load_data->n_items = g_list_length (load_data->items);
+static void
+populate_model_with_folders (GtkFileChooserDefault *impl, GList *items)
+{
+ GList *folders;
+ GList *l;
- limit = get_recent_files_limit (GTK_WIDGET (impl));
-
- if (limit != -1 && (load_data->n_items > limit))
- {
- GList *clamp, *l;
+ folders = _gtk_file_chooser_extract_recent_folders (items);
- clamp = g_list_nth (load_data->items, limit - 1);
- if (G_LIKELY (clamp))
- {
- l = clamp->next;
- clamp->next = NULL;
+ for (l = folders; l; l = l->next)
+ {
+ GFile *folder = l->data;
- g_list_foreach (l, (GFunc) gtk_recent_info_unref, NULL);
- g_list_free (l);
+ _gtk_file_system_model_add_and_query_file (impl->recent_model,
+ folder,
+ MODEL_ATTRIBUTES);
+ }
- load_data->n_items = limit;
- }
- }
+ g_list_foreach (folders, (GFunc) g_object_unref, NULL);
+ g_list_free (folders);
+}
- load_data->n_loaded_items = 0;
- load_data->needs_sorting = FALSE;
+static gboolean
+recent_idle_load (gpointer data)
+{
+ RecentLoadData *load_data = data;
+ GtkFileChooserDefault *impl = load_data->impl;
- return TRUE;
- }
+ if (!impl->recent_manager)
+ return FALSE;
- /* finished loading items */
- for (walk = load_data->items; walk; walk = walk->next)
- {
- GtkRecentInfo *info = walk->data;
- file = g_file_new_for_uri (gtk_recent_info_get_uri (info));
+ load_data->items = gtk_recent_manager_get_items (impl->recent_manager);
+ if (!load_data->items)
+ return FALSE;
- _gtk_file_system_model_add_and_query_file (impl->recent_model,
- file,
- MODEL_ATTRIBUTES);
- gtk_recent_info_unref (walk->data);
- g_object_unref (file);
- }
+ if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN)
+ populate_model_with_recent_items (impl, load_data->items);
+ else
+ populate_model_with_folders (impl, load_data->items);
+ g_list_foreach (load_data->items, (GFunc) gtk_recent_info_unref, NULL);
g_list_free (load_data->items);
load_data->items = NULL;
load_data = g_new (RecentLoadData, 1);
load_data->impl = impl;
load_data->items = NULL;
- load_data->n_items = 0;
- load_data->n_loaded_items = 0;
- load_data->needs_sorting = TRUE;
/* begin lazy loading the recent files into the model */
impl->load_recent_id = gdk_threads_add_idle_full (G_PRIORITY_HIGH_IDLE + 30,
return (gtk_tree_selection_count_selected_rows (selection) != 0);
}
-/* Hide the location widgets temporarily */
-static void
-recent_hide_entry (GtkFileChooserDefault *impl)
-{
- GtkWidget *label;
- GtkWidget *image;
- gchar *tmp;
-
- impl->recent_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-
- /* Image */
- image = gtk_image_new_from_icon_name ("document-open-recent", GTK_ICON_SIZE_BUTTON);
- gtk_box_pack_start (GTK_BOX (impl->recent_hbox), image, FALSE, FALSE, 5);
-
- /* Label */
- label = gtk_label_new (NULL);
- tmp = g_strdup_printf ("<b>%s</b>", _("Recently Used"));
- gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), tmp);
- gtk_box_pack_start (GTK_BOX (impl->recent_hbox), label, FALSE, FALSE, 0);
- g_free (tmp);
-
- gtk_widget_hide (impl->browse_path_bar);
- gtk_widget_hide (impl->browse_new_folder_button);
-
- /* Box for recent widgets */
- gtk_box_pack_start (GTK_BOX (impl->browse_path_bar_hbox), impl->recent_hbox, TRUE, TRUE, 0);
- gtk_size_group_add_widget (impl->browse_path_bar_size_group, impl->recent_hbox);
- gtk_widget_show_all (impl->recent_hbox);
-
- /* Hide the location widgets temporarily */
- if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
- impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
- {
- gtk_widget_hide (impl->location_button);
- gtk_widget_hide (impl->location_entry_box);
- }
-}
-
-/* Main entry point to the recent files functions; this gets called when
- * the user activates the Recently Used shortcut.
- */
-static void
-recent_activate (GtkFileChooserDefault *impl)
-{
- OperationMode previous_mode;
-
- if (impl->operation_mode == OPERATION_MODE_RECENT)
- return;
-
- previous_mode = impl->operation_mode;
- impl->operation_mode = OPERATION_MODE_RECENT;
-
- stop_operation (impl, previous_mode);
-
- recent_hide_entry (impl);
-
- file_list_set_sort_column_ids (impl);
- recent_start_loading (impl);
-}
-
static void
set_current_filter (GtkFileChooserDefault *impl,
GtkFileFilter *filter)
{
GFile *file;
- switch (impl->operation_mode)
- {
- case OPERATION_MODE_BROWSE:
- break;
- case OPERATION_MODE_SEARCH:
- search_switch_to_browse_mode (impl);
- break;
- case OPERATION_MODE_RECENT:
- recent_switch_to_browse_mode (impl);
- break;
- }
+ operation_mode_set (impl, OPERATION_MODE_BROWSE);
/* We ref the file chooser since volume_mount() may run a main loop, and the
* user could close the file chooser window in the meantime.
gpointer col_data;
ShortcutType shortcut_type;
- if (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY
+ /* In the Save modes, we want to preserve what the uesr typed in the filename
+ * entry, so that he may choose another folder without erasing his typed name.
+ */
+ if (impl->location_entry
&& !(impl->action == GTK_FILE_CHOOSER_ACTION_SAVE
|| impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER))
_gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->location_entry), "");
volume = col_data;
+ operation_mode_set (impl, OPERATION_MODE_BROWSE);
+
shortcuts_activate_volume (impl, volume);
}
else if (shortcut_type == SHORTCUT_TYPE_FILE)
struct ShortcutsActivateData *data;
GtkFileSystemVolume *volume;
+ operation_mode_set (impl, OPERATION_MODE_BROWSE);
+
volume = _gtk_file_system_get_volume_for_file (impl->file_system, col_data);
data = g_new0 (struct ShortcutsActivateData, 1);
}
else if (shortcut_type == SHORTCUT_TYPE_SEARCH)
{
- search_activate (impl);
+ operation_mode_set (impl, OPERATION_MODE_SEARCH);
}
else if (shortcut_type == SHORTCUT_TYPE_RECENT)
{
- recent_activate (impl);
+ operation_mode_set (impl, OPERATION_MODE_RECENT);
}
}
if (impl->location_entry)
update_chooser_entry (impl);
+ path_bar_update (impl);
+
check_preview_change (impl);
bookmarks_check_add_sensitivity (impl);
+ check_copy_file_location_sensitivity (impl);
g_signal_emit_by_name (impl, "selection-changed", 0);
}
if (impl->operation_mode != OPERATION_MODE_BROWSE)
{
GtkWidget *widget_to_focus;
-
- /* This will give us the location widgets back */
- switch (impl->operation_mode)
- {
- case OPERATION_MODE_SEARCH:
- search_switch_to_browse_mode (impl);
- break;
- case OPERATION_MODE_RECENT:
- recent_switch_to_browse_mode (impl);
- break;
- case OPERATION_MODE_BROWSE:
- g_assert_not_reached ();
- break;
- }
+ operation_mode_set (impl, OPERATION_MODE_BROWSE);
+
if (impl->current_folder)
change_folder_and_display_error (impl, impl->current_folder, FALSE);
if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
impl->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
{
- LocationMode new_mode;
-
- if (path != NULL)
- {
- /* since the user typed something, we unconditionally want to turn on the entry */
- new_mode = LOCATION_MODE_FILENAME_ENTRY;
- }
- else if (impl->location_mode == LOCATION_MODE_PATH_BAR)
- new_mode = LOCATION_MODE_FILENAME_ENTRY;
- else if (impl->location_mode == LOCATION_MODE_FILENAME_ENTRY)
- new_mode = LOCATION_MODE_PATH_BAR;
- else
- {
- g_assert_not_reached ();
- return;
- }
+ if (!path)
+ return;
- location_mode_set (impl, new_mode, TRUE);
- if (new_mode == LOCATION_MODE_FILENAME_ENTRY)
- {
- if (path != NULL)
- location_set_user_text (impl, path);
- else
- {
- location_entry_set_initial_text (impl);
- gtk_editable_select_region (GTK_EDITABLE (impl->location_entry), 0, -1);
- }
- }
+ location_mode_set (impl, LOCATION_MODE_FILENAME_ENTRY, TRUE);
+ location_set_user_text (impl, path);
}
else if (impl->action == GTK_FILE_CHOOSER_ACTION_SAVE ||
impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
projects / ~andy / gtk / blobdiff