62 lines
3.2 KiB
Diff
62 lines
3.2 KiB
Diff
Index: b/gtk/gtkfilechooserwidget.c
|
|
===================================================================
|
|
--- a/gtk/gtkfilechooserwidget.c
|
|
+++ b/gtk/gtkfilechooserwidget.c
|
|
@@ -29,6 +29,7 @@
|
|
#include "gtkcellrendererpixbuf.h"
|
|
#include "gtkcellrenderertext.h"
|
|
#include "gtkcheckmenuitem.h"
|
|
+#include "deprecated/gtkimagemenuitem.h"
|
|
#include "gtkclipboard.h"
|
|
#include "gtkcomboboxtext.h"
|
|
#include "gtkdragsource.h"
|
|
@@ -2281,6 +2282,10 @@ append_separator (GtkWidget *box)
|
|
{
|
|
GtkWidget *separator;
|
|
|
|
+ separator = gtk_separator_menu_item_new ();
|
|
+ gtk_widget_set_visible (GTK_WIDGET (separator), TRUE);
|
|
+ gtk_menu_shell_append (GTK_MENU_SHELL (box), separator);
|
|
+ return separator;
|
|
separator = g_object_new (GTK_TYPE_SEPARATOR,
|
|
"orientation", GTK_ORIENTATION_HORIZONTAL,
|
|
"visible", TRUE,
|
|
@@ -2302,6 +2307,14 @@ add_button (GtkWidget *box,
|
|
{
|
|
GtkWidget *item;
|
|
|
|
+ if (g_str_match_string ("toggle", action, TRUE))
|
|
+ item = gtk_check_menu_item_new_with_mnemonic (label);
|
|
+ else
|
|
+ item = gtk_image_menu_item_new_with_mnemonic (label);
|
|
+ g_object_set (G_OBJECT (item), "action-name", action, NULL);
|
|
+ gtk_widget_set_visible (GTK_WIDGET (item), TRUE);
|
|
+ gtk_menu_shell_append (GTK_MENU_SHELL (box), item);
|
|
+ return item;
|
|
item = g_object_new (GTK_TYPE_MODEL_BUTTON,
|
|
"visible", TRUE,
|
|
"action-name", action,
|
|
@@ -2326,6 +2339,9 @@ file_list_build_popover (GtkFileChooserW
|
|
g_object_set (box, "margin", 10, NULL);
|
|
gtk_widget_show (box);
|
|
gtk_container_add (GTK_CONTAINER (priv->browse_files_popover), box);
|
|
+ priv->browse_files_popover = gtk_menu_new ();
|
|
+ gtk_menu_attach_to_widget (GTK_MENU (priv->browse_files_popover), GTK_WIDGET (priv->browse_files_tree_view), NULL);
|
|
+ box = priv->browse_files_popover;
|
|
|
|
priv->visit_file_item = add_button (box, _("_Visit File"), "item.visit");
|
|
priv->open_folder_item = add_button (box, _("_Open With File Manager"), "item.open");
|
|
@@ -2342,6 +2358,12 @@ file_list_build_popover (GtkFileChooserW
|
|
priv->type_column_item = add_button (box, _("Show T_ype Column"), "item.toggle-show-type");
|
|
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");
|
|
+ g_object_set (priv->visit_file_item, "image", gtk_image_new_from_icon_name ("gtk-jump-to", GTK_ICON_SIZE_MENU), NULL);
|
|
+ g_object_set (priv->open_folder_item, "image", gtk_image_new_from_icon_name ("gtk-open", GTK_ICON_SIZE_MENU), NULL);
|
|
+ g_object_set (priv->copy_file_location_item, "image", gtk_image_new_from_icon_name ("gtk-copy", GTK_ICON_SIZE_MENU), NULL);
|
|
+ g_object_set (priv->add_shortcut_item, "image", gtk_image_new_from_icon_name ("gtk-add", GTK_ICON_SIZE_MENU), NULL);
|
|
+ g_object_set (priv->delete_file_item, "image", gtk_image_new_from_icon_name ("gtk-delete", GTK_ICON_SIZE_MENU), NULL);
|
|
+ g_object_set (priv->trash_file_item, "image", gtk_image_new_from_icon_name ("user-trash-full",GTK_ICON_SIZE_MENU), NULL);
|
|
}
|
|
|
|
/* Updates the popover for the file list, creating it if necessary */
|