AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-07 19:30:12 +00:00
Code Issues Projects Releases Wiki Activity

file chooser: Use a popover for the context menu

Browse Source 
Use a popover for the context menu, and add a long press gesture
to allow opening it with touch.
This commit is contained in:
Matthias Clasen 2015-07-16 10:45:14 -04:00
parent e08c5262b7
commit 33cc51d994
1 changed files with 266 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

456
gtk/gtkfilechooserwidget.c
View File

@ -72,6 +72,9 @@
#include "gtkpopover.h" #include "gtkpopover.h"
#include "gtkrevealer.h" #include "gtkrevealer.h"
#include "gtkspinner.h" #include "gtkspinner.h"
#include "gtkseparator.h"
#include "gtkmodelbutton.h"
#include "gtkgesturelongpress.h"
#include <cairo-gobject.h> #include <cairo-gobject.h>
@ -213,7 +216,8 @@ struct _GtkFileChooserWidgetPrivate {
GtkWidget *browse_files_stack; GtkWidget *browse_files_stack;
GtkWidget *browse_files_swin; GtkWidget *browse_files_swin;
GtkWidget *browse_files_tree_view; GtkWidget *browse_files_tree_view;
GtkWidget *browse_files_popup_menu;
GtkWidget *browse_files_popover;
GtkWidget *add_shortcut_item; GtkWidget *add_shortcut_item;
GtkWidget *hidden_files_item; GtkWidget *hidden_files_item;
GtkWidget *size_column_item; GtkWidget *size_column_item;
@ -225,6 +229,7 @@ struct _GtkFileChooserWidgetPrivate {
GtkWidget *delete_file_item; GtkWidget *delete_file_item;
GtkWidget *sort_directories_item; GtkWidget *sort_directories_item;
GtkWidget *show_time_item; GtkWidget *show_time_item;
GtkWidget *browse_new_folder_button; GtkWidget *browse_new_folder_button;
GtkSizeGroup *browse_path_bar_size_group; GtkSizeGroup *browse_path_bar_size_group;
GtkWidget *browse_path_bar; GtkWidget *browse_path_bar;
@ -238,6 +243,8 @@ struct _GtkFileChooserWidgetPrivate {
GtkWidget *rename_file_popover; GtkWidget *rename_file_popover;
GFile *rename_file_source_file; GFile *rename_file_source_file;
GtkGesture *long_press_gesture;
GtkFileSystemModel *browse_files_model; GtkFileSystemModel *browse_files_model;
char *browse_files_last_selected_name; char *browse_files_last_selected_name;
@ -1383,32 +1390,6 @@ gtk_file_chooser_widget_key_press_event (GtkWidget *widget,
return FALSE; return FALSE;
} }
/* Callback used when the file list's popup menu is detached */
static void
popup_menu_detach_cb (GtkWidget *attach_widget,
GtkMenu *menu)
{
GtkFileChooserWidget *impl = g_object_get_data (G_OBJECT (attach_widget), "GtkFileChooserWidget");
GtkFileChooserWidgetPrivate *priv;
g_assert (GTK_IS_FILE_CHOOSER_WIDGET (impl));
priv = impl->priv;
priv->browse_files_popup_menu = NULL;
priv->add_shortcut_item = NULL;
priv->hidden_files_item = NULL;
priv->size_column_item = NULL;
priv->copy_file_location_item = NULL;
priv->visit_file_item = NULL;
priv->rename_file_item = NULL;
priv->trash_file_item = NULL;
priv->delete_file_item = NULL;
priv->open_folder_item = NULL;
priv->sort_directories_item = NULL;
priv->show_time_item = NULL;
}
/* Callback used from gtk_tree_selection_selected_foreach(); adds a bookmark for /* Callback used from gtk_tree_selection_selected_foreach(); adds a bookmark for
* each selected item in the file list. * each selected item in the file list.
*/ */
@ -1433,9 +1414,11 @@ add_bookmark_foreach_cb (GtkTreeModel *model,
/* Callback used when the "Add to Bookmarks" menu item is activated */ /* Callback used when the "Add to Bookmarks" menu item is activated */
static void static void
add_to_shortcuts_cb (GtkMenuItem *item, add_to_shortcuts_cb (GSimpleAction *action,
GtkFileChooserWidget *impl) GVariant *parameter,
gpointer data)
{ {
GtkFileChooserWidget *impl = data;
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
GtkTreeSelection *selection; GtkTreeSelection *selection;
@ -1509,9 +1492,11 @@ delete_selected_cb (GtkTreeModel *model,
} }
static void static void
delete_file_cb (GtkMenuItem *item, delete_file_cb (GSimpleAction *action,
GtkFileChooserWidget *impl) GVariant *parameter,
gpointer data)
{ {
GtkFileChooserWidget *impl = data;
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
GtkTreeSelection *selection; GtkTreeSelection *selection;
@ -1537,9 +1522,11 @@ trash_selected_cb (GtkTreeModel *model,
static void static void
trash_file_cb (GtkMenuItem *item, trash_file_cb (GSimpleAction *action,
GtkFileChooserWidget *impl) GVariant *parameter,
gpointer data)
{ {
GtkFileChooserWidget *impl = data;
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
GtkTreeSelection *selection; GtkTreeSelection *selection;
@ -1636,9 +1623,11 @@ rename_selected_cb (GtkTreeModel *model,
} }
static void static void
rename_file_cb (GtkMenuItem *item, rename_file_cb (GSimpleAction *action,
GtkFileChooserWidget *impl) GVariant *parameter,
gpointer data)
{ {
GtkFileChooserWidget *impl = data;
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
GtkTreeSelection *selection; GtkTreeSelection *selection;
@ -1707,9 +1696,11 @@ copy_file_clear_cb (GtkClipboard *clipboard,
/* Callback used when the "Copy file’s location" menu item is activated */ /* Callback used when the "Copy file’s location" menu item is activated */
static void static void
copy_file_location_cb (GtkMenuItem *item, copy_file_location_cb (GSimpleAction *action,
GtkFileChooserWidget *impl) GVariant *parameter,
gpointer data)
{ {
GtkFileChooserWidget *impl = data;
GSList *selected_files = NULL; GSList *selected_files = NULL;
selected_files = get_selected_files (impl); selected_files = get_selected_files (impl);
@ -1741,9 +1732,11 @@ copy_file_location_cb (GtkMenuItem *item,
/* Callback used when the "Visit this file" menu item is activated */ /* Callback used when the "Visit this file" menu item is activated */
static void static void
visit_file_cb (GtkMenuItem *item, visit_file_cb (GSimpleAction *action,
GtkFileChooserWidget *impl) GVariant *parameter,
gpointer data)
{ {
GtkFileChooserWidget *impl = data;
GSList *files; GSList *files;
files = get_selected_files (impl); files = get_selected_files (impl);
@ -1762,9 +1755,11 @@ visit_file_cb (GtkMenuItem *item,
/* Callback used when the "Open this folder" menu item is activated */ /* Callback used when the "Open this folder" menu item is activated */
static void static void
open_folder_cb (GtkMenuItem *item, open_folder_cb (GSimpleAction *action,
GtkFileChooserWidget *impl) GVariant *parameter,
gpointer data)
{ {
GtkFileChooserWidget *impl = data;
GSList *files; GSList *files;
files = get_selected_files (impl); files = get_selected_files (impl);
@ -1786,35 +1781,43 @@ open_folder_cb (GtkMenuItem *item,
/* callback used when the "Show Hidden Files" menu item is toggled */ /* callback used when the "Show Hidden Files" menu item is toggled */
static void static void
show_hidden_toggled_cb (GtkCheckMenuItem *item, change_show_hidden_state (GSimpleAction *action,
GtkFileChooserWidget *impl) GVariant *state,
gpointer data)
{ {
g_object_set (impl, GtkFileChooserWidget *impl = data;
"show-hidden", gtk_check_menu_item_get_active (item),
NULL); g_simple_action_set_state (action, state);
g_object_set (impl, "show-hidden", g_variant_get_boolean (state), NULL);
} }
/* Callback used when the "Show Size Column" menu item is toggled */ /* Callback used when the "Show Size Column" menu item is toggled */
static void static void
show_size_column_toggled_cb (GtkCheckMenuItem *item, change_show_size_state (GSimpleAction *action,
GtkFileChooserWidget *impl) GVariant *state,
gpointer data)
{ {
GtkFileChooserWidget *impl = data;
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
priv->show_size_column = gtk_check_menu_item_get_active (item); g_simple_action_set_state (action, state);
priv->show_size_column = g_variant_get_boolean (state);
gtk_tree_view_column_set_visible (priv->list_size_column, gtk_tree_view_column_set_visible (priv->list_size_column,
priv->show_size_column); priv->show_size_column);
} }
static void static void
sort_directories_toggled_cb (GtkCheckMenuItem *item, change_sort_directories_first_state (GSimpleAction *action,
GtkFileChooserWidget *impl) GVariant *state,
gpointer data)
{ {
GtkFileChooserWidget *impl = data;
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
GtkTreeSortable *sortable; GtkTreeSortable *sortable;
priv->sort_directories_first = gtk_check_menu_item_get_active (item); g_simple_action_set_state (action, state);
priv->sort_directories_first = g_variant_get_boolean (state);
/* force resorting */ /* force resorting */
sortable = GTK_TREE_SORTABLE (priv->browse_files_model); sortable = GTK_TREE_SORTABLE (priv->browse_files_model);
@ -1875,12 +1878,15 @@ update_time_renderer_visible (GtkFileChooserWidget *impl)
} }
static void static void
show_time_toggled_cb (GtkCheckMenuItem *item, change_show_time_state (GSimpleAction *action,
GtkFileChooserWidget *impl) GVariant *state,
gpointer data)
{ {
GtkFileChooserWidget *impl = data;
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
priv->show_time = gtk_check_menu_item_get_active (item); g_simple_action_set_state (action, state);
priv->show_time = g_variant_get_boolean (state);
update_time_renderer_visible (impl); update_time_renderer_visible (impl);
} }
@ -2077,28 +2083,35 @@ file_list_drag_end_cb (GtkWidget *widget,
* a selection active. * a selection active.
*/ */
static void static void
check_file_list_menu_sensitivity (GtkFileChooserWidget *impl) check_file_list_popover_sensitivity (GtkFileChooserWidget *impl)
{ {
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
gint num_selected; gint num_selected;
gboolean all_files; gboolean all_files;
gboolean all_folders; gboolean all_folders;
gboolean active; gboolean active;
GActionGroup *actions;
GAction *action, *action2;
actions = gtk_widget_get_action_group (priv->browse_files_tree_view, "item");
selection_check (impl, &num_selected, &all_files, &all_folders); selection_check (impl, &num_selected, &all_files, &all_folders);
active = (num_selected != 0); active = (num_selected != 0);
if (priv->copy_file_location_item) action = g_action_map_lookup_action (G_ACTION_MAP (actions), "copy-location");
gtk_widget_set_sensitive (priv->copy_file_location_item, active); g_simple_action_set_enabled (G_SIMPLE_ACTION (action), active);
if (priv->add_shortcut_item)
gtk_widget_set_sensitive (priv->add_shortcut_item, active && all_folders); action = g_action_map_lookup_action (G_ACTION_MAP (actions), "add-shortcut");
if (priv->visit_file_item) g_simple_action_set_enabled (G_SIMPLE_ACTION (action), active && all_folders);
gtk_widget_set_sensitive (priv->visit_file_item, active);
if (priv->open_folder_item) action = g_action_map_lookup_action (G_ACTION_MAP (actions), "visit");
gtk_widget_set_visible (priv->open_folder_item, (num_selected == 1) && all_folders); g_simple_action_set_enabled (G_SIMPLE_ACTION (action), active);
if (priv->rename_file_item)
{ action = g_action_map_lookup_action (G_ACTION_MAP (actions), "open");
g_simple_action_set_enabled (G_SIMPLE_ACTION (action), (num_selected == 1) && all_folders);
action = g_action_map_lookup_action (G_ACTION_MAP (actions), "rename");
if (num_selected == 1) if (num_selected == 1)
{ {
GSList *infos; GSList *infos;
@ -2107,17 +2120,17 @@ check_file_list_menu_sensitivity (GtkFileChooserWidget *impl)
infos = get_selected_infos (impl); infos = get_selected_infos (impl);
info = G_FILE_INFO (infos->data); info = G_FILE_INFO (infos->data);
gtk_widget_set_sensitive (priv->rename_file_item, g_simple_action_set_enabled (G_SIMPLE_ACTION (action),
g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME)); g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME));
g_slist_free_full (infos, g_object_unref); g_slist_free_full (infos, g_object_unref);
} }
else else
gtk_widget_set_sensitive (priv->rename_file_item, FALSE); g_simple_action_set_enabled (G_SIMPLE_ACTION (action), FALSE);
}
action = g_action_map_lookup_action (G_ACTION_MAP (actions), "delete");
action2 = g_action_map_lookup_action (G_ACTION_MAP (actions), "trash");
if (priv->delete_file_item && priv->trash_file_item)
{
if (num_selected == 1) if (num_selected == 1)
{ {
GSList *infos; GSList *infos;
@ -2128,19 +2141,19 @@ check_file_list_menu_sensitivity (GtkFileChooserWidget *impl)
if (g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH)) if (g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH))
{ {
gtk_widget_set_sensitive (priv->trash_file_item, TRUE); g_simple_action_set_enabled (G_SIMPLE_ACTION (action2), TRUE);
gtk_widget_set_visible (priv->delete_file_item, FALSE); gtk_widget_set_visible (priv->delete_file_item, FALSE);
gtk_widget_set_visible (priv->trash_file_item, TRUE); gtk_widget_set_visible (priv->trash_file_item, TRUE);
} }
else if (g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE)) else if (g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE))
{ {
gtk_widget_set_sensitive (priv->delete_file_item, TRUE); g_simple_action_set_enabled (G_SIMPLE_ACTION (action), TRUE);
gtk_widget_set_visible (priv->delete_file_item, TRUE); gtk_widget_set_visible (priv->delete_file_item, TRUE);
gtk_widget_set_visible (priv->trash_file_item, FALSE); gtk_widget_set_visible (priv->trash_file_item, FALSE);
} }
else else
{ {
gtk_widget_set_sensitive (priv->trash_file_item, FALSE); g_simple_action_set_enabled (G_SIMPLE_ACTION (action2), FALSE);
gtk_widget_set_visible (priv->delete_file_item, FALSE); gtk_widget_set_visible (priv->delete_file_item, FALSE);
gtk_widget_set_visible (priv->trash_file_item, TRUE); gtk_widget_set_visible (priv->trash_file_item, TRUE);
} }
@ -2151,104 +2164,114 @@ check_file_list_menu_sensitivity (GtkFileChooserWidget *impl)
{ {
gtk_widget_set_visible (priv->delete_file_item, FALSE); gtk_widget_set_visible (priv->delete_file_item, FALSE);
gtk_widget_set_visible (priv->trash_file_item, TRUE); gtk_widget_set_visible (priv->trash_file_item, TRUE);
gtk_widget_set_sensitive (priv->trash_file_item, FALSE); g_simple_action_set_enabled (G_SIMPLE_ACTION (action2), FALSE);
}
} }
} }
static GtkWidget * static GActionEntry entries[] = {
file_list_add_menu_item (GtkFileChooserWidget *impl, { "visit", visit_file_cb, NULL, NULL, NULL },
const char *mnemonic_label, { "open", open_folder_cb, NULL, NULL, NULL },
GCallback callback) { "copy-location", copy_file_location_cb, NULL, NULL, NULL },
{ "add-shortcut", add_to_shortcuts_cb, NULL, NULL, NULL },
{ "rename", rename_file_cb, NULL, NULL, NULL },
{ "delete", delete_file_cb, NULL, NULL, NULL },
{ "trash", trash_file_cb, NULL, NULL, NULL },
{ "toggle-show-hidden", NULL, NULL, "false", change_show_hidden_state },
{ "toggle-show-size", NULL, NULL, "false", change_show_size_state },
{ "toggle-show-time", NULL, NULL, "false", change_show_time_state },
{ "toggle-sort-dirs-first", NULL, NULL, "false", change_sort_directories_first_state }
};
static void
add_actions (GtkFileChooserWidget *impl)
{ {
GtkFileChooserWidgetPrivate *priv = impl->priv; GActionGroup *actions;
GtkWidget *item;
item = gtk_menu_item_new_with_mnemonic (mnemonic_label); actions = G_ACTION_GROUP (g_simple_action_group_new ());
g_signal_connect (item, "activate", callback, impl); g_action_map_add_action_entries (G_ACTION_MAP (actions),
gtk_widget_show (item); entries, G_N_ELEMENTS (entries),
gtk_menu_shell_append (GTK_MENU_SHELL (priv->browse_files_popup_menu), item); impl);
gtk_widget_insert_action_group (GTK_WIDGET (impl->priv->browse_files_tree_view), "item", actions);
return item; g_object_unref (actions);
} }
static GtkWidget * static GtkWidget *
file_list_add_check_menu_item (GtkFileChooserWidget *impl, append_separator (GtkWidget *box)
const char *mnemonic_label,
GCallback callback)
{ {
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkWidget *separator;
GtkWidget *item;
item = gtk_check_menu_item_new_with_mnemonic (mnemonic_label); separator = g_object_new (GTK_TYPE_SEPARATOR,
g_signal_connect (item, "toggled", callback, impl); "orientation", GTK_ORIENTATION_HORIZONTAL,
gtk_widget_show (item); "visible", TRUE,
gtk_menu_shell_append (GTK_MENU_SHELL (priv->browse_files_popup_menu), item); "margin-start", 12,
"margin-end", 12,
"margin-top", 6,
"margin-bottom", 6,
NULL);
gtk_container_add (GTK_CONTAINER (box), separator);
return item; return separator;
} }
/* Constructs the popup menu for the file list if needed */ /* Constructs the popup menu for the file list if needed */
static void static GtkWidget *
file_list_build_popup_menu (GtkFileChooserWidget *impl) add_button (GtkWidget *box,
const gchar *label,
const gchar *action)
{ {
GtkFileChooserWidgetPrivate *priv = impl->priv;
GtkWidget *item; GtkWidget *item;
if (priv->browse_files_popup_menu) item = g_object_new (GTK_TYPE_MODEL_BUTTON,
return; "visible", TRUE,
"action-name", action,
"text", label,
NULL);
gtk_container_add (GTK_CONTAINER (box), item);
priv->browse_files_popup_menu = gtk_menu_new (); return item;
gtk_menu_attach_to_widget (GTK_MENU (priv->browse_files_popup_menu),
priv->browse_files_tree_view,
popup_menu_detach_cb);
priv->visit_file_item
= file_list_add_menu_item (impl, _("_Visit File"), G_CALLBACK (visit_file_cb));
priv->open_folder_item
= file_list_add_menu_item (impl, _("_Open With File Manager"), G_CALLBACK (open_folder_cb));
priv->copy_file_location_item
= file_list_add_menu_item (impl, _("_Copy Location"), G_CALLBACK (copy_file_location_cb));
priv->add_shortcut_item
= file_list_add_menu_item (impl, _("_Add to Bookmarks"), G_CALLBACK (add_to_shortcuts_cb));
priv->rename_file_item
= file_list_add_menu_item (impl, _("_Rename"), G_CALLBACK (rename_file_cb));
priv->delete_file_item
= file_list_add_menu_item (impl, _("_Delete"), G_CALLBACK (delete_file_cb));
priv->trash_file_item
= file_list_add_menu_item (impl, _("_Move to Trash"), G_CALLBACK (trash_file_cb));
item = gtk_separator_menu_item_new ();
gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (priv->browse_files_popup_menu), item);
priv->hidden_files_item
= file_list_add_check_menu_item (impl, _("Show _Hidden Files"), G_CALLBACK (show_hidden_toggled_cb));
priv->size_column_item
= file_list_add_check_menu_item (impl, _("Show _Size Column"), G_CALLBACK (show_size_column_toggled_cb));
priv->show_time_item
= file_list_add_check_menu_item (impl, _("Show _Time"), G_CALLBACK (show_time_toggled_cb));
priv->sort_directories_item
= file_list_add_check_menu_item (impl, _("Sort _Folders before Files"), G_CALLBACK (sort_directories_toggled_cb));
} }
/* Updates the popup menu for the file list, creating it if necessary */
static void static void
file_list_update_popup_menu (GtkFileChooserWidget *impl) file_list_build_popover (GtkFileChooserWidget *impl)
{ {
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
GtkWidget *box;
file_list_build_popup_menu (impl); if (priv->browse_files_popover)
check_file_list_menu_sensitivity (impl); return;
priv->browse_files_popover = gtk_popover_new (priv->browse_files_tree_view);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
g_object_set (box, "margin", 10, NULL);
gtk_widget_show (box);
gtk_container_add (GTK_CONTAINER (priv->browse_files_popover), box);
priv->visit_file_item = add_button (box, _("_Visit File"), "item.visit");
priv->open_folder_item = add_button (box, _("_Open With File Manager"), "item.open");
priv->copy_file_location_item = add_button (box, _("_Copy Location"), "item.copy-location");
priv->add_shortcut_item = add_button (box, _("_Add to Bookmarks"), "item.add-shortcut");
priv->rename_file_item = add_button (box, _("_Rename"), "item.rename");
priv->delete_file_item = add_button (box, _("_Delete"), "item.delete");
priv->trash_file_item = add_button (box, _("_Move to Trash"), "item.trash");
append_separator (box);
priv->hidden_files_item = add_button (box, _("Show _Hidden Files"), "item.toggle-show-hidden");
priv->size_column_item = add_button (box, _("Show _Size Column"), "item.toggle-show-size");
priv->show_time_item = add_button (box, _("Show _Time"), "item.toggle-show-time");
priv->sort_directories_item = add_button (box, _("Sort _Folders before Files"), "item.toggle-sort-dirs-first");
}
/* Updates the popover for the file list, creating it if necessary */
static void
file_list_update_popover (GtkFileChooserWidget *impl)
{
GtkFileChooserWidgetPrivate *priv = impl->priv;
GActionGroup *actions;
GAction *action;
file_list_build_popover (impl);
check_file_list_popover_sensitivity (impl);
/* The sensitivity of the Add to Bookmarks item is set in /* The sensitivity of the Add to Bookmarks item is set in
* bookmarks_check_add_sensitivity() * bookmarks_check_add_sensitivity()
@ -2263,96 +2286,53 @@ file_list_update_popup_menu (GtkFileChooserWidget *impl)
gtk_widget_set_visible (priv->trash_file_item, FALSE); gtk_widget_set_visible (priv->trash_file_item, FALSE);
} }
/* 'Visit this file' */
gtk_widget_set_visible (priv->visit_file_item, (priv->operation_mode != OPERATION_MODE_BROWSE)); gtk_widget_set_visible (priv->visit_file_item, (priv->operation_mode != OPERATION_MODE_BROWSE));
/* 'Show Hidden Files' */ actions = gtk_widget_get_action_group (priv->browse_files_tree_view, "item");
g_signal_handlers_block_by_func (priv->hidden_files_item, action = g_action_map_lookup_action (G_ACTION_MAP (actions), "toggle-show-hidden");
G_CALLBACK (show_hidden_toggled_cb), impl); g_simple_action_set_state (G_SIMPLE_ACTION (action), g_variant_new_boolean (priv->show_hidden));
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (priv->hidden_files_item),
priv->show_hidden);
g_signal_handlers_unblock_by_func (priv->hidden_files_item,
G_CALLBACK (show_hidden_toggled_cb), impl);
/* 'Show Size Column' */ action = g_action_map_lookup_action (G_ACTION_MAP (actions), "toggle-show-size");
g_signal_handlers_block_by_func (priv->size_column_item, g_simple_action_set_state (G_SIMPLE_ACTION (action), g_variant_new_boolean (priv->show_size_column));
G_CALLBACK (show_size_column_toggled_cb), impl);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (priv->size_column_item),
priv->show_size_column);
g_signal_handlers_unblock_by_func (priv->size_column_item,
G_CALLBACK (show_size_column_toggled_cb), impl);
g_signal_handlers_block_by_func (priv->sort_directories_item, action = g_action_map_lookup_action (G_ACTION_MAP (actions), "toggle-show-time");
G_CALLBACK (sort_directories_toggled_cb), impl); g_simple_action_set_state (G_SIMPLE_ACTION (action), g_variant_new_boolean (priv->show_time));
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (priv->sort_directories_item),
priv->sort_directories_first);
g_signal_handlers_unblock_by_func (priv->sort_directories_item,
G_CALLBACK (sort_directories_toggled_cb), impl);
g_signal_handlers_block_by_func (priv->show_time_item, action = g_action_map_lookup_action (G_ACTION_MAP (actions), "toggle-sort-dirs-first");
G_CALLBACK (show_time_toggled_cb), impl); g_simple_action_set_state (G_SIMPLE_ACTION (action), g_variant_new_boolean (priv->sort_directories_first));
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (priv->show_time_item),
priv->show_time);
g_signal_handlers_unblock_by_func (priv->show_time_item,
G_CALLBACK (show_time_toggled_cb), impl);
} }
static void static void
popup_position_func (GtkMenu *menu, file_list_show_popover (GtkFileChooserWidget *impl,
gint *x, GdkRectangle *rect)
gint *y,
gboolean *push_in,
gpointer user_data)
{
GtkAllocation allocation;
GtkWidget *widget = GTK_WIDGET (user_data);
GdkScreen *screen = gtk_widget_get_screen (widget);
GtkRequisition req;
gint monitor_num;
GdkRectangle monitor;
g_return_if_fail (gtk_widget_get_realized (widget));
gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
gtk_widget_get_preferred_size (GTK_WIDGET (menu),
&req, NULL);
gtk_widget_get_allocation (widget, &allocation);
*x += (allocation.width - req.width) / 2;
*y += (allocation.height - req.height) / 2;
monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
gtk_menu_set_monitor (menu, monitor_num);
gdk_screen_get_monitor_workarea (screen, monitor_num, &monitor);
*x = CLAMP (*x, monitor.x, monitor.x + MAX (0, monitor.width - req.width));
*y = CLAMP (*y, monitor.y, monitor.y + MAX (0, monitor.height - req.height));
*push_in = FALSE;
}
static void
file_list_popup_menu (GtkFileChooserWidget *impl,
GdkEventButton *event)
{ {
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
GdkRectangle r;
file_list_update_popup_menu (impl); file_list_update_popover (impl);
if (event)
gtk_menu_popup (GTK_MENU (priv->browse_files_popup_menu), if (rect == NULL)
NULL, NULL, NULL, NULL,
event->button, event->time);
else
{ {
gtk_menu_popup (GTK_MENU (priv->browse_files_popup_menu), GtkTreeSelection *selection;
NULL, NULL, GtkTreeModel *model;
popup_position_func, priv->browse_files_tree_view, GList *list;
0, GDK_CURRENT_TIME); GtkTreePath *path;
gtk_menu_shell_select_first (GTK_MENU_SHELL (priv->browse_files_popup_menu),
FALSE); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->browse_files_tree_view));
list = gtk_tree_selection_get_selected_rows (selection, &model);
path = list->data;
gtk_tree_view_get_cell_area (GTK_TREE_VIEW (priv->browse_files_tree_view), path, NULL, &r);
gtk_tree_view_convert_bin_window_to_widget_coords (GTK_TREE_VIEW (priv->browse_files_tree_view), r.x, r.y, &r.x, &r.y);
r.x = 0;
r.width = gtk_widget_get_allocated_width (priv->browse_files_tree_view);
rect = &r;
g_list_free_full (list, (GDestroyNotify) gtk_tree_path_free);
} }
gtk_popover_set_pointing_to (GTK_POPOVER (priv->browse_files_popover), rect);
gtk_widget_show (priv->browse_files_popover);
} }
/* Callback used for the GtkWidget::popup-menu signal of the file list */ /* Callback used for the GtkWidget::popup-menu signal of the file list */
@ -2360,7 +2340,7 @@ static gboolean
list_popup_menu_cb (GtkWidget *widget, list_popup_menu_cb (GtkWidget *widget,
GtkFileChooserWidget *impl) GtkFileChooserWidget *impl)
{ {
file_list_popup_menu (impl, NULL); file_list_show_popover (impl, NULL);
return TRUE; return TRUE;
} }
@ -2373,7 +2353,6 @@ list_button_press_event_cb (GtkWidget *widget,
GtkFileChooserWidget *impl) GtkFileChooserWidget *impl)
{ {
GtkFileChooserWidgetPrivate *priv = impl->priv; GtkFileChooserWidgetPrivate *priv = impl->priv;
static gboolean in_press = FALSE; static gboolean in_press = FALSE;
if (in_press) if (in_press)
@ -2386,10 +2365,20 @@ list_button_press_event_cb (GtkWidget *widget,
gtk_widget_event (priv->browse_files_tree_view, (GdkEvent *) event); gtk_widget_event (priv->browse_files_tree_view, (GdkEvent *) event);
in_press = FALSE; in_press = FALSE;
file_list_popup_menu (impl, event); file_list_show_popover (impl, NULL);
return TRUE; return TRUE;
} }
static void
long_press_cb (GtkGesture *gesture,
gdouble x,
gdouble y,
GtkFileChooserWidget *impl)
{
file_list_show_popover (impl, NULL);
}
typedef struct { typedef struct {
OperationMode operation_mode; OperationMode operation_mode;
gint general_column; gint general_column;
@ -3534,6 +3523,12 @@ gtk_file_chooser_widget_dispose (GObject *object)
cancel_all_operations (impl); cancel_all_operations (impl);
if (priv->browse_files_popover)
{
gtk_widget_destroy (priv->browse_files_popover);
priv->browse_files_popover = NULL;
}
if (priv->extra_widget) if (priv->extra_widget)
{ {
g_object_unref (priv->extra_widget); g_object_unref (priv->extra_widget);
@ -8459,6 +8454,8 @@ post_process_ui (GtkFileChooserWidget *impl)
gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->new_folder_popover), impl->priv->new_folder_create_button); gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->new_folder_popover), impl->priv->new_folder_create_button);
gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->rename_file_rename_button); gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->rename_file_rename_button);
add_actions (impl);
} }
void void
@ -8521,6 +8518,11 @@ gtk_file_chooser_widget_init (GtkFileChooserWidget *impl)
priv->bookmarks_manager = _gtk_bookmarks_manager_new (NULL, NULL); priv->bookmarks_manager = _gtk_bookmarks_manager_new (NULL, NULL);
priv->long_press_gesture = gtk_gesture_long_press_new (priv->browse_files_tree_view);
gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (priv->long_press_gesture), TRUE);
g_signal_connect (priv->long_press_gesture, "pressed",
G_CALLBACK (long_press_cb), impl);
/* Setup various attributes and callbacks in the UI /* Setup various attributes and callbacks in the UI
* which cannot be done with GtkBuilder. * which cannot be done with GtkBuilder.
*/ */