Use XfceGtkMenuAction for thunar window menu (Bug #16654) (1d6a2e27) · Commits · Xfce / thunar

thunar/thunar-application.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -374,7 +374,6 @@ thunar_application_startup (GApplication *gapp)
		/* connect to the session manager */
		application->session_client = thunar_session_client_new (opt_sm_client_id);

		/* TODO: how do accel maps integrate with GAction/GMenu? Using GtkAction for now */
		/* check if we have a saved accel map */
		path = xfce_resource_lookup (XFCE_RESOURCE_CONFIG, ACCEL_MAP_PATH);
		if (G_LIKELY (path != NULL))

thunar/thunar-menu.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -305,7 +305,14 @@ thunar_menu_add_sections (ThunarMenu *menu,

		if (menu_sections & THUNAR_MENU_SECTION_ZOOM)
		{
		// TODO
		window = thunar_launcher_get_widget (menu->launcher);
		if (THUNAR_IS_WINDOW (window))
		{
		thunar_window_append_menu_item (THUNAR_WINDOW (window), GTK_MENU_SHELL (menu), THUNAR_WINDOW_ACTION_ZOOM_IN);
		thunar_window_append_menu_item (THUNAR_WINDOW (window), GTK_MENU_SHELL (menu), THUNAR_WINDOW_ACTION_ZOOM_OUT);
		thunar_window_append_menu_item (THUNAR_WINDOW (window), GTK_MENU_SHELL (menu), THUNAR_WINDOW_ACTION_ZOOM_RESET);
		xfce_gtk_menu_append_seperator (GTK_MENU_SHELL (menu));
		}
		}

		if (menu_sections & THUNAR_MENU_SECTION_PROPERTIES)

thunar/thunar-window.c

+740 −664

File changed.

Preview size limit exceeded, changes collapsed.

thunar/thunar-window.h

+82 −25

Original line number	Diff line number	Diff line
		@@ -24,6 +24,8 @@
		#include <thunar/thunar-folder.h>
		#include <thunar/thunar-launcher.h>

		#include <libxfce4ui/libxfce4ui.h>

		G_BEGIN_DECLS;

		typedef struct _ThunarWindowClass ThunarWindowClass;
		@@ -36,19 +38,70 @@ typedef struct _ThunarWindow ThunarWindow;
		#define THUNAR_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_TYPE_WINDOW))
		#define THUNAR_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_TYPE_WINDOW, ThunarWindowClass))

		GType thunar_window_get_type (void) G_GNUC_CONST;
		/* #XfceGtkActionEntrys provided by this widget */
		typedef enum
		{
		THUNAR_WINDOW_ACTION_FILE_MENU,
		THUNAR_WINDOW_ACTION_NEW_TAB,
		THUNAR_WINDOW_ACTION_NEW_WINDOW,
		THUNAR_WINDOW_ACTION_DETACH_TAB,
		THUNAR_WINDOW_ACTION_CLOSE_TAB,
		THUNAR_WINDOW_ACTION_CLOSE_WINDOW,
		THUNAR_WINDOW_ACTION_CLOSE_ALL_WINDOWS,
		THUNAR_WINDOW_ACTION_EDIT_MENU,
		THUNAR_WINDOW_ACTION_PREFERENCES,
		THUNAR_WINDOW_ACTION_VIEW_MENU,
		THUNAR_WINDOW_ACTION_RELOAD,
		THUNAR_WINDOW_ACTION_RELOAD_ALT,
		THUNAR_WINDOW_ACTION_VIEW_LOCATION_SELECTOR_MENU,
		THUNAR_WINDOW_ACTION_VIEW_LOCATION_SELECTOR_PATHBAR,
		THUNAR_WINDOW_ACTION_VIEW_LOCATION_SELECTOR_TOOLBAR,
		THUNAR_WINDOW_ACTION_VIEW_SIDE_PANE_MENU,
		THUNAR_WINDOW_ACTION_VIEW_SIDE_PANE_SHORTCUTS,
		THUNAR_WINDOW_ACTION_VIEW_SIDE_PANE_TREE,
		THUNAR_WINDOW_ACTION_TOGGLE_SIDE_PANE,
		THUNAR_WINDOW_ACTION_VIEW_STATUSBAR,
		THUNAR_WINDOW_ACTION_VIEW_MENUBAR,
		THUNAR_WINDOW_ACTION_SHOW_HIDDEN,
		THUNAR_WINDOW_ACTION_ZOOM_IN,
		THUNAR_WINDOW_ACTION_ZOOM_IN_ALT,
		THUNAR_WINDOW_ACTION_ZOOM_OUT,
		THUNAR_WINDOW_ACTION_ZOOM_RESET,
		THUNAR_WINDOW_ACTION_VIEW_AS_ICONS,
		THUNAR_WINDOW_ACTION_VIEW_AS_DETAILED_LIST,
		THUNAR_WINDOW_ACTION_VIEW_AS_COMPACT_LIST,
		THUNAR_WINDOW_ACTION_GO_MENU,
		THUNAR_WINDOW_ACTION_OPEN_PARENT,
		THUNAR_WINDOW_ACTION_BACK,
		THUNAR_WINDOW_ACTION_BACK_ALT,
		THUNAR_WINDOW_ACTION_FORWARD,
		THUNAR_WINDOW_ACTION_OPEN_FILE_SYSTEM,
		THUNAR_WINDOW_ACTION_OPEN_HOME,
		THUNAR_WINDOW_ACTION_OPEN_DESKTOP,
		THUNAR_WINDOW_ACTION_OPEN_COMPUTER,
		THUNAR_WINDOW_ACTION_OPEN_TRASH,
		THUNAR_WINDOW_ACTION_OPEN_LOCATION,
		THUNAR_WINDOW_ACTION_OPEN_LOCATION_ALT,
		THUNAR_WINDOW_ACTION_OPEN_TEMPLATES,
		THUNAR_WINDOW_ACTION_OPEN_NETWORK,
		THUNAR_WINDOW_ACTION_HELP_MENU,
		THUNAR_WINDOW_ACTION_CONTENTS,
		THUNAR_WINDOW_ACTION_ABOUT,
		THUNAR_WINDOW_ACTION_SWITCH_PREV_TAB,
		THUNAR_WINDOW_ACTION_SWITCH_NEXT_TAB,

		} ThunarWindowAction;

		GType thunar_window_get_type (void) G_GNUC_CONST;
		ThunarFile thunar_window_get_current_directory (ThunarWindow window);
		void thunar_window_set_current_directory (ThunarWindow *window,
		ThunarFile *current_directory);

		void thunar_window_scroll_to_file (ThunarWindow *window,
		ThunarFile *file,
		gboolean select,
		gboolean use_align,
		gfloat row_align,
		gfloat col_align);

		gchar *thunar_window_get_directories (ThunarWindow window,
		gint *active_page);
		gboolean thunar_window_set_directories (ThunarWindow *window,
		@@ -61,8 +114,12 @@ void thunar_window_notebook_insert (ThunarWindow *window,
		ThunarFile *directory);
		gboolean thunar_window_has_shortcut_sidepane (ThunarWindow *window);
		GtkWidget* thunar_window_get_sidepane (ThunarWindow *window);
		void thunar_window_append_menu_item (ThunarWindow *window,
		GtkMenuShell *menu,
		ThunarWindowAction action);
		ThunarLauncher* thunar_window_get_launcher (ThunarWindow *window);

		const XfceGtkActionEntry* thunar_window_get_action_entry (ThunarWindow *window,
		ThunarWindowAction action);
		G_END_DECLS;

		#endif /* !__THUNAR_WINDOW_H__ */