use XfceGtkActionEntry for toolbar (4542272e) · Commits · Xfce / thunar

po/POTFILES.in

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@ thunar/thunar-gdk-extensions.c
		thunar/thunar-gio-extensions.c
		thunar/thunar-gobject-extensions.c
		thunar/thunar-gtk-extensions.c
		thunar/thunar-history-action.c
		thunar/thunar-history.c
		thunar/thunar-ice.c
		thunar/thunar-icon-factory.c

thunar/Makefile.am

+0 −2

Original line number	Diff line number	Diff line
		@@ -108,8 +108,6 @@ thunar_SOURCES = \
		thunar-gobject-extensions.h \
		thunar-gtk-extensions.c \
		thunar-gtk-extensions.h \
		thunar-history-action.c \
		thunar-history-action.h \
		thunar-history.c \
		thunar-history.h \
		thunar-ice.c \

thunar/thunar-gtk-extensions.c

+1 −67

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		#include <thunar/thunar-util.h>


		#include <libxfce4ui/libxfce4ui.h>

		/**
		* thunar_gtk_action_set_tooltip:
		@@ -68,36 +69,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS



		/**
		* thunar_gtk_action_group_set_action_sensitive:
		* @action_group : a #GtkActionGroup.
		* @action_name : the name of a #GtkAction in @action_group.
		* @sensitive : the new sensitivity.
		*
		* Convenience function to change the sensitivity of an action
		* in @action_group (whose name is @action_name) to @sensitive.
		**/
		void
		thunar_gtk_action_group_set_action_sensitive (GtkActionGroup *action_group,
		const gchar *action_name,
		gboolean sensitive)
		{
		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
		GtkAction *action;

		_thunar_return_if_fail (GTK_IS_ACTION_GROUP (action_group));
		_thunar_return_if_fail (action_name != NULL && *action_name != '\0');

		/* query the action from the group */
		action = gtk_action_group_get_action (action_group, action_name);

		/* apply the sensitivity to the action */
		gtk_action_set_sensitive (action, sensitive);
		G_GNUC_END_IGNORE_DEPRECATIONS
		}



		/**
		* thunar_gtk_label_set_a11y_relation:
		* @label : a #GtkLabel.
		@@ -220,43 +191,6 @@ thunar_gtk_menu_run_at_event (GtkMenu *menu,



		/**
		* thunar_gtk_ui_manager_get_action_by_name:
		* @ui_manager : a #GtkUIManager.
		* @action_name : the name of a #GtkAction in @ui_manager.
		*
		* Looks up the #GtkAction with the given @action_name in all
		* #GtkActionGroup<!---->s associated with @ui_manager. Returns
		* %NULL if no such #GtkAction exists in @ui_manager.
		*
		* Return value: the #GtkAction of the given @action_name in
		* @ui_manager or %NULL.
		**/
		GtkAction*
		thunar_gtk_ui_manager_get_action_by_name (GtkUIManager *ui_manager,
		const gchar *action_name)
		{
		GtkAction *action;
		GList *lp;

		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
		_thunar_return_val_if_fail (GTK_IS_UI_MANAGER (ui_manager), NULL);
		_thunar_return_val_if_fail (action_name != NULL, NULL);

		/* check all action groups associated with the ui manager */
		for (lp = gtk_ui_manager_get_action_groups (ui_manager); lp != NULL; lp = lp->next)
		{
		action = gtk_action_group_get_action (lp->data, action_name);
		if (G_LIKELY (action != NULL))
		return action;
		}
		G_GNUC_END_IGNORE_DEPRECATIONS

		return NULL;
		}



		/**
		* thunar_gtk_widget_set_tooltip:
		* @widget : a #GtkWidget for which to set the tooltip.

thunar/thunar-gtk-extensions.h

+0 −9

Original line number	Diff line number	Diff line
		@@ -28,21 +28,12 @@ void thunar_gtk_action_set_tooltip (GtkAction
		const gchar *format,
		...) G_GNUC_PRINTF (2, 3);

		void thunar_gtk_action_group_set_action_sensitive (GtkActionGroup *action_group,
		const gchar *action_name,
		gboolean sensitive);

		void thunar_gtk_label_set_a11y_relation (GtkLabel *label,
		GtkWidget *widget);

		void thunar_gtk_menu_run (GtkMenu *menu);

		void thunar_gtk_menu_run_at_event (GtkMenu *menu,
		GdkEvent *event);

		GtkAction thunar_gtk_ui_manager_get_action_by_name (GtkUIManager ui_manager,
		const gchar *action_name);

		void thunar_gtk_widget_set_tooltip (GtkWidget *widget,
		const gchar *format,
		...) G_GNUC_PRINTF (2, 3);

thunar/thunar-history-action.c

deleted100644 → 0

+0 −364

Original line number	Diff line number	Diff line
		/* vi:set et ai sw=2 sts=2 ts=2: */
		/*-
		* Copyright (c) 2006 Benedikt Meurer <benny@xfce.org>
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of the GNU General Public License as published by the Free
		* Software Foundation; either version 2 of the License, or (at your option)
		* any later version.
		*
		* This program is distributed in the hope that it will be useful, but WITHOUT
		* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
		* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
		* more details.
		*
		* You should have received a copy of the GNU General Public License along with
		* this program; if not, write to the Free Software Foundation, Inc., 59 Temple
		* Place, Suite 330, Boston, MA 02111-1307 USA
		*/

		#ifdef HAVE_CONFIG_H
		#include <config.h>
		#endif

		#include <thunar/thunar-gtk-extensions.h>
		#include <thunar/thunar-history-action.h>
		#include <thunar/thunar-private.h>



		static GtkWidget thunar_history_action_create_tool_item (GtkAction action);
		static void thunar_history_action_show_menu (GtkWidget *tool_item,
		ThunarHistoryAction *history_action);



		struct _ThunarHistoryActionClass
		{
		GtkActionClass __parent__;
		};

		struct _ThunarHistoryAction
		{
		GtkAction __parent__;

		guint popup_delay;
		};



		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
		G_DEFINE_TYPE (ThunarHistoryAction, thunar_history_action, GTK_TYPE_ACTION)
		G_GNUC_END_IGNORE_DEPRECATIONS



		static void
		thunar_history_action_class_init (ThunarHistoryActionClass *klass)
		{
		GtkActionClass *gtkaction_class;

		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
		gtkaction_class = GTK_ACTION_CLASS (klass);
		G_GNUC_END_IGNORE_DEPRECATIONS
		gtkaction_class->create_tool_item = thunar_history_action_create_tool_item;

		/**
		* ThunarHistoryAction::show-menu:
		* @history_action : a #ThunarHistoryAction.
		* @menu : the #GtkMenu to which to add the items to display.
		*
		* Emitted by the @history_action right before the @menu is shown.
		**/
		g_signal_new (I_("show-menu"),
		G_TYPE_FROM_CLASS (klass),
		G_SIGNAL_RUN_LAST, 0, NULL, NULL,
		g_cclosure_marshal_VOID__OBJECT,
		G_TYPE_NONE, 1, GTK_TYPE_MENU);
		}



		static void
		thunar_history_action_init (ThunarHistoryAction *actions_changed)
		{
		}



		static gboolean
		thunar_history_action_popup_delayed (gpointer data)
		{
		GtkWidget *button = GTK_WIDGET (data);
		ThunarHistoryAction *history_action;

		history_action = g_object_get_data (G_OBJECT (button), I_("thunar-history-action"));
		thunar_history_action_show_menu (button, history_action);
		history_action->popup_delay = 0;

		return FALSE;
		}



		static gboolean
		thunar_history_action_button_press_event (GtkWidget *toggle_button,
		GdkEventButton *event,
		GtkWidget *tool_item)
		{
		ThunarHistoryAction *history_action;

		_thunar_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button), FALSE);
		_thunar_return_val_if_fail (GTK_IS_TOOL_ITEM (tool_item), FALSE);

		history_action = g_object_get_data (G_OBJECT (toggle_button), I_("thunar-history-action"));

		if (event->button == 1)
		{
		/* shouldn't happen, but stop pending timeout */
		if (history_action->popup_delay != 0)
		g_source_remove (history_action->popup_delay);

		/* schedule a popup for button press */
		history_action->popup_delay = g_timeout_add (500, thunar_history_action_popup_delayed, toggle_button);
		}
		else if (event->button == 3)
		{
		/* directy show the menu */
		thunar_history_action_show_menu (toggle_button, history_action);
		}

		return FALSE;
		}



		static gboolean
		thunar_history_action_button_release_event (GtkWidget *toggle_button,
		GdkEventButton *event,
		GtkWidget *tool_item)
		{
		ThunarHistoryAction *history_action;

		_thunar_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button), FALSE);
		_thunar_return_val_if_fail (GTK_IS_TOOL_ITEM (tool_item), FALSE);

		if (event->button == 1)
		{
		history_action = g_object_get_data (G_OBJECT (toggle_button), I_("thunar-history-action"));
		if (history_action->popup_delay != 0)
		{
		/* stop timeout */
		g_source_remove (history_action->popup_delay);
		history_action->popup_delay = 0;

		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
		/* activate event */
		gtk_action_activate (GTK_ACTION (history_action));
		G_GNUC_END_IGNORE_DEPRECATIONS
		}
		}
		else
		{
		return TRUE;
		}

		/* bit of a strange trick to get the button untoggeled */
		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle_button),
		gtk_widget_is_sensitive (toggle_button));

		return FALSE;
		}



		static gboolean
		thunar_history_action_leave_notify_event (GtkWidget *toggle_button,
		GdkEventCrossing *event,
		ThunarHistoryAction *history_action)
		{

		GtkAllocation alloc;

		_thunar_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button), FALSE);
		_thunar_return_val_if_fail (THUNAR_IS_HISTORY_ACTION (history_action), FALSE);

		if (history_action->popup_delay != 0)
		{
		/* stop the timeout */
		g_source_remove (history_action->popup_delay);
		history_action->popup_delay = 0;

		/* if the user dragged to the bottom, directly popup the menu */
		gtk_widget_get_allocation (toggle_button, &alloc);
		if (event->x >= 0
		&& event->x < alloc.width
		&& event->y >= alloc.height)
		{
		thunar_history_action_show_menu (toggle_button, history_action);
		}
		}

		return FALSE;
		}



		static void
		thunar_history_action_activate (GtkWidget *toggle_button,
		ThunarHistoryAction *history_action)
		{
		_thunar_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
		_thunar_return_if_fail (THUNAR_IS_HISTORY_ACTION (history_action));

		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
		/* activate event (only key events trigger this function) */
		gtk_action_activate (GTK_ACTION (history_action));
		G_GNUC_END_IGNORE_DEPRECATIONS

		/* activate, so the code deactivates a bit later... */
		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle_button), TRUE);
		}



		static void
		thunar_history_action_toolbar_configured (GtkWidget *tool_item,
		GtkWidget *toggle_button)
		{
		GtkWidget *icon;
		GtkAction *action;

		gtk_button_set_relief (GTK_BUTTON (toggle_button),
		gtk_tool_item_get_relief_style (GTK_TOOL_ITEM (tool_item)));

		icon = gtk_bin_get_child (GTK_BIN (toggle_button));
		action = g_object_get_data (G_OBJECT (toggle_button), I_("thunar-history-action"));
		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
		gtk_image_set_from_icon_name (GTK_IMAGE (icon),
		gtk_action_get_icon_name (action),
		gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (tool_item)));
		G_GNUC_END_IGNORE_DEPRECATIONS
		}



		static GtkWidget*
		thunar_history_action_create_tool_item (GtkAction *action)
		{
		GtkWidget *tool_item;
		GtkWidget *button;
		GtkWidget *icon;

		_thunar_return_val_if_fail (THUNAR_IS_HISTORY_ACTION (action), NULL);

		/* allocate the tool item with an empty menu */
		tool_item = g_object_new (GTK_TYPE_TOOL_ITEM, NULL);
		gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE);

		button = gtk_toggle_button_new ();
		gtk_container_add (GTK_CONTAINER (tool_item), button);
		gtk_button_set_relief (GTK_BUTTON (button),
		gtk_tool_item_get_relief_style (GTK_TOOL_ITEM (tool_item)));
		gtk_widget_set_focus_on_click (button, FALSE);
		gtk_widget_show (button);

		G_GNUC_BEGIN_IGNORE_DEPRECATIONS
		icon = gtk_image_new_from_icon_name (gtk_action_get_icon_name (action),
		gtk_tool_item_get_icon_size (GTK_TOOL_ITEM (tool_item)));
		G_GNUC_END_IGNORE_DEPRECATIONS
		gtk_container_add (GTK_CONTAINER (button), icon);
		gtk_widget_show (icon);

		g_object_set_data (G_OBJECT (button), I_("thunar-history-action"), action);

		g_signal_connect (G_OBJECT (tool_item), "toolbar-reconfigured",
		G_CALLBACK (thunar_history_action_toolbar_configured), button);
		g_signal_connect (G_OBJECT (button), "button-press-event",
		G_CALLBACK (thunar_history_action_button_press_event), tool_item);
		g_signal_connect (G_OBJECT (button), "button-release-event",
		G_CALLBACK (thunar_history_action_button_release_event), tool_item);
		g_signal_connect (G_OBJECT (button), "leave-notify-event",
		G_CALLBACK (thunar_history_action_leave_notify_event), action);
		g_signal_connect (G_OBJECT (button), "activate",
		G_CALLBACK (thunar_history_action_activate), action);

		return tool_item;
		}



		static void
		thunar_history_action_menu_deactivate (GtkWidget *toggle_button)
		{
		/* untoggle the button */
		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle_button), FALSE);
		}



		static void
		thunar_history_action_show_menu (GtkWidget *toggle_button,
		ThunarHistoryAction *history_action)
		{
		GtkWidget *menu;

		_thunar_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
		_thunar_return_if_fail (THUNAR_IS_HISTORY_ACTION (history_action));

		/* allocate a new menu for the action */
		menu = gtk_menu_new ();
		gtk_menu_attach_to_widget (GTK_MENU (menu), toggle_button, NULL);
		g_signal_connect_swapped (G_OBJECT (menu), "deactivate",
		G_CALLBACK (thunar_history_action_menu_deactivate), toggle_button);

		/* generate the menu items */
		g_signal_emit_by_name (G_OBJECT (history_action), "show-menu", menu);

		/* toggle the button */
		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle_button), TRUE);

		/* run the menu (takes over the floating of menu) */
		thunar_gtk_menu_run (GTK_MENU (menu));
		}



		/**
		* thunar_history_action_new:
		* @name : the name for the action.
		* @label : the label for the action.
		* @tooltip : the tooltip for the action.
		* @iconname : the icon name for the action.
		*
		* Allocates a new #ThunarHistoryAction with the specified
		* parameters.
		*
		* Return value: the newly allocated #ThunarHistoryAction.
		**/
		GtkAction*
		thunar_history_action_new (const gchar *name,
		const gchar *label,
		const gchar *tooltip,
		const gchar *iconname)
		{
		gchar *fulltip;
		GtkAction *action;

		_thunar_return_val_if_fail (name != NULL, NULL);

		/* extend history tooltip with function of the button */
		fulltip = g_strconcat (tooltip, "\n", _("Right-click or pull down to show history"), NULL);

		action = g_object_new (THUNAR_TYPE_HISTORY_ACTION,
		"name", name,
		"label", label,
		"tooltip", fulltip,
		"icon-name", iconname,
		NULL);

		g_free (fulltip);

		return action;
		}