X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-navigation-action.c;h=b34c37892b781ff12573546366c854665cd28af7;hb=6935cbce7dce37600abe92eec6344ffde0cc6bae;hp=a4a13bcbccf0fd755ba57d29eb9de95626394ae3;hpb=dbe299f7b2412d318f0eda7c401feba68c8663e3;p=evince.git diff --git a/shell/ev-navigation-action.c b/shell/ev-navigation-action.c index a4a13bcb..b34c3789 100644 --- a/shell/ev-navigation-action.c +++ b/shell/ev-navigation-action.c @@ -14,50 +14,51 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $Id$ */ #include "config.h" +#include +#include + #include "ev-navigation-action.h" -#include "ev-window.h" +#include "ev-navigation-action-widget.h" -#include -#include -#include -#include -#include -#include -#include -struct _EvNavigationActionPrivate +enum { - EvWindow *window; - EvNavigationDirection direction; - char *arrow_tooltip; - EvHistory *history; + WIDGET_ACTIVATE_LINK, + WIDGET_N_SIGNALS }; -enum +static guint widget_signals[WIDGET_N_SIGNALS] = {0, }; + +struct _EvNavigationActionPrivate { - PROP_0, - PROP_ARROW_TOOLTIP, - PROP_DIRECTION + EvHistory *history; }; static void ev_navigation_action_init (EvNavigationAction *action); static void ev_navigation_action_class_init (EvNavigationActionClass *class); -static GObjectClass *parent_class = NULL; - G_DEFINE_TYPE (EvNavigationAction, ev_navigation_action, GTK_TYPE_ACTION) #define MAX_LABEL_LENGTH 48 #define EV_NAVIGATION_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EV_TYPE_NAVIGATION_ACTION, EvNavigationActionPrivate)) +static void +ev_navigation_action_history_changed (EvHistory *history, + gpointer data) +{ + EvNavigationAction *action = EV_NAVIGATION_ACTION (data); + + gtk_action_set_sensitive (GTK_ACTION (action), + ev_history_get_n_links (history) > 0); +} + void ev_navigation_action_set_history (EvNavigationAction *action, EvHistory *history) @@ -65,7 +66,11 @@ ev_navigation_action_set_history (EvNavigationAction *action, action->priv->history = history; g_object_add_weak_pointer (G_OBJECT (action->priv->history), - (gpointer *) &action->priv->history); + (gpointer) &action->priv->history); + + g_signal_connect_object (history, "changed", + G_CALLBACK (ev_navigation_action_history_changed), + action, 0); } static void @@ -76,7 +81,14 @@ activate_menu_item_cb (GtkWidget *widget, EvNavigationAction *action) g_return_if_fail (EV_IS_HISTORY (action->priv->history)); index = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "index")); - ev_history_set_current_index (action->priv->history, index); + + if (action->priv->history) { + EvLink *link; + + link = ev_history_get_link_nth (action->priv->history, index); + + g_signal_emit (action, widget_signals[WIDGET_ACTIVATE_LINK], 0, link); + } } static GtkWidget * @@ -90,10 +102,11 @@ new_history_menu_item (EvNavigationAction *action, title = ev_link_get_title (link); item = gtk_image_menu_item_new_with_label (title); + label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (item))); + gtk_label_set_use_markup (label, TRUE); g_object_set_data (G_OBJECT (item), "index", GINT_TO_POINTER (index)); - label = GTK_LABEL (GTK_BIN (item)->child); gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); gtk_label_set_max_width_chars (label, MAX_LABEL_LENGTH); @@ -110,138 +123,102 @@ static GtkWidget * build_menu (EvNavigationAction *action) { GtkMenuShell *menu; + GtkWidget *item; + EvLink *link; EvHistory *history = action->priv->history; int start, end, i; - menu = GTK_MENU_SHELL (gtk_menu_new ()); - - if (history == NULL) { - return GTK_WIDGET (menu); + if (history == NULL || ev_history_get_n_links (history) <= 0) { + return NULL; } - if (action->priv->direction == EV_NAVIGATION_DIRECTION_BACK) { - start = 0; - end = ev_history_get_current_index (history); - } else { - start = ev_history_get_current_index (history) + 1; - end = ev_history_get_n_links (history); - } + menu = GTK_MENU_SHELL (gtk_menu_new ()); - for (i = start; i < end; i++) { - EvLink *link = ev_history_get_link_nth (history, i); - GtkWidget *item; + start = 0; + end = ev_history_get_n_links (history); + for (i = start; i < end; i++) { + link = ev_history_get_link_nth (history, i); item = new_history_menu_item (action, link, i); - gtk_menu_shell_append (menu, item); + gtk_menu_shell_prepend (menu, item); } return GTK_WIDGET (menu); } static void -menu_activated_cb (GtkMenuToolButton *button, +menu_activated_cb (EvNavigationActionWidget *button, EvNavigationAction *action) { GtkWidget *menu; menu = build_menu (action); - gtk_menu_tool_button_set_menu (button, menu); -} - -static gboolean -set_tooltip_cb (GtkMenuToolButton *proxy, - GtkTooltips *tooltips, - const char *tip, - const char *tip_private, - EvNavigationAction *action) -{ - gtk_menu_tool_button_set_arrow_tooltip (proxy, tooltips, - action->priv->arrow_tooltip, - NULL); - - /* don't stop emission */ - return FALSE; + ev_navigation_action_widget_set_menu (button, menu); } static void connect_proxy (GtkAction *action, GtkWidget *proxy) { - if (GTK_IS_MENU_TOOL_BUTTON (proxy)) - { - GtkWidget *menu; + GtkWidget *menu; + if (GTK_IS_TOOL_ITEM (proxy)) { /* set dummy menu so the arrow gets sensitive */ menu = gtk_menu_new (); - gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (proxy), menu); + ev_navigation_action_widget_set_menu (EV_NAVIGATION_ACTION_WIDGET (proxy), menu); g_signal_connect (proxy, "show-menu", G_CALLBACK (menu_activated_cb), action); - - g_signal_connect (proxy, "set-tooltip", - G_CALLBACK (set_tooltip_cb), action); } - GTK_ACTION_CLASS (parent_class)->connect_proxy (action, proxy); + GTK_ACTION_CLASS (ev_navigation_action_parent_class)->connect_proxy (action, proxy); } -static void -ev_navigation_action_init (EvNavigationAction *action) +static GtkWidget * +create_tool_item (GtkAction *action) { - action->priv = EV_NAVIGATION_ACTION_GET_PRIVATE (action); + EvNavigationActionWidget *proxy; + + proxy = g_object_new (EV_TYPE_NAVIGATION_ACTION_WIDGET, NULL); + gtk_widget_show (GTK_WIDGET (proxy)); + + return GTK_WIDGET (proxy); } -static void -ev_navigation_action_finalize (GObject *object) +static GtkWidget * +create_menu_item (GtkAction *action) { - EvNavigationAction *action = EV_NAVIGATION_ACTION (object); + GtkWidget *menu; + GtkWidget *menu_item; - if (action->priv->history) { - g_object_add_weak_pointer (G_OBJECT (action->priv->history), - (gpointer *) &action->priv->history); - } + menu = build_menu (EV_NAVIGATION_ACTION (action)); - g_free (action->priv->arrow_tooltip); + menu_item = GTK_ACTION_CLASS (ev_navigation_action_parent_class)->create_menu_item (action); - parent_class->finalize (object); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), menu); + + gtk_widget_show (menu_item); + + return menu_item; } static void -ev_navigation_action_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +ev_navigation_action_init (EvNavigationAction *action) { - EvNavigationAction *nav = EV_NAVIGATION_ACTION (object); - - switch (prop_id) - { - case PROP_ARROW_TOOLTIP: - nav->priv->arrow_tooltip = g_value_dup_string (value); - g_object_notify (object, "tooltip"); - break; - case PROP_DIRECTION: - nav->priv->direction = g_value_get_int (value); - break; - } + action->priv = EV_NAVIGATION_ACTION_GET_PRIVATE (action); } static void -ev_navigation_action_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +ev_navigation_action_finalize (GObject *object) { - EvNavigationAction *nav = EV_NAVIGATION_ACTION (object); - - switch (prop_id) - { - case PROP_ARROW_TOOLTIP: - g_value_set_string (value, nav->priv->arrow_tooltip); - break; - case PROP_DIRECTION: - g_value_set_int (value, nav->priv->direction); - break; + EvNavigationAction *action = EV_NAVIGATION_ACTION (object); + + if (action->priv->history) { + g_object_remove_weak_pointer (G_OBJECT (action->priv->history), + (gpointer) &action->priv->history); + action->priv->history = NULL; } + + G_OBJECT_CLASS (ev_navigation_action_parent_class)->finalize (object); } static void @@ -251,31 +228,20 @@ ev_navigation_action_class_init (EvNavigationActionClass *class) GtkActionClass *action_class = GTK_ACTION_CLASS (class); object_class->finalize = ev_navigation_action_finalize; - object_class->set_property = ev_navigation_action_set_property; - object_class->get_property = ev_navigation_action_get_property; - - parent_class = g_type_class_peek_parent (class); - action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON; + action_class->toolbar_item_type = GTK_TYPE_TOOL_ITEM; + action_class->create_tool_item = create_tool_item; action_class->connect_proxy = connect_proxy; - - g_object_class_install_property (object_class, - PROP_ARROW_TOOLTIP, - g_param_spec_string ("arrow-tooltip", - "Arrow Tooltip", - "Arrow Tooltip", - NULL, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_DIRECTION, - g_param_spec_int ("direction", - "Direction", - "Direction", - 0, - G_MAXINT, - 0, - G_PARAM_READWRITE)); + action_class->create_menu_item = create_menu_item; + + widget_signals[WIDGET_ACTIVATE_LINK] = g_signal_new ("activate_link", + G_OBJECT_CLASS_TYPE (object_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (EvNavigationActionClass, activate_link), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + G_TYPE_OBJECT); g_type_class_add_private (object_class, sizeof (EvNavigationActionPrivate)); }