X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Feggfindbar.c;h=f887a2503e3ff39e6b0cf10c9a24532d5bd30f1d;hb=e769474337c9a6ffdaed2327056e8de2f7ca9ee4;hp=05ec11ced9a21793afd67aeeecadbf768b9fecba;hpb=d03e2388d98142e9852a9cc65b6f9b626c1387ae;p=evince.git diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c index 05ec11ce..f887a250 100644 --- a/shell/eggfindbar.c +++ b/shell/eggfindbar.c @@ -1,41 +1,30 @@ /* Copyright (C) 2004 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with the Gnome Library; see the file COPYING.LIB. If not, + * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -This library 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 -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the Gnome Library; see the file COPYING.LIB. If not, -write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. -*/ - -#include +#include "config.h" -#include "eggfindbar.h" +#include #include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include "eggfindbar.h" struct _EggFindBarPrivate { @@ -154,8 +143,8 @@ egg_find_bar_class_init (EggFindBarClass *klass) g_object_class_install_property (object_class, PROP_SEARCH_STRING, g_param_spec_string ("search_string", - _("Search string"), - _("The name of the string to be found"), + "Search string", + "The name of the string to be found", NULL, G_PARAM_READWRITE)); @@ -168,23 +157,23 @@ egg_find_bar_class_init (EggFindBarClass *klass) g_object_class_install_property (object_class, PROP_CASE_SENSITIVE, g_param_spec_boolean ("case_sensitive", - _("Case sensitive"), - _("TRUE for a case sensitive search"), + "Case sensitive", + "TRUE for a case sensitive search", FALSE, G_PARAM_READWRITE)); /* Style properties */ gtk_widget_class_install_style_property (widget_class, g_param_spec_boxed ("all_matches_color", - _("Highlight color"), - _("Color of highlight for all matches"), + "Highlight color", + "Color of highlight for all matches", GDK_TYPE_COLOR, G_PARAM_READABLE)); gtk_widget_class_install_style_property (widget_class, g_param_spec_boxed ("current_match_color", - _("Current color"), - _("Color of highlight for the current match"), + "Current color", + "Color of highlight for the current match", GDK_TYPE_COLOR, G_PARAM_READABLE)); @@ -192,16 +181,27 @@ egg_find_bar_class_init (EggFindBarClass *klass) binding_set = gtk_binding_set_by_class (klass); - gtk_binding_entry_add_signal (binding_set, GDK_Escape, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, "close", 0); - gtk_binding_entry_add_signal (binding_set, GDK_Up, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_BACKWARD); - - gtk_binding_entry_add_signal (binding_set, GDK_Down, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0, "scroll", 1, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_FORWARD); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0, + "scroll", 1, + GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, 0, + "scroll", 1, + GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0, + "scroll", 1, + GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, 0, + "scroll", 1, + GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); } static void @@ -280,7 +280,7 @@ set_focus_cb (GtkWidget *window, while (widget != NULL && widget != wbar) { - widget = widget->parent; + widget = gtk_widget_get_parent (widget); } /* if widget == bar, the new focus widget is in the bar, so we @@ -326,19 +326,19 @@ egg_find_bar_init (EggFindBar *find_bar) /* Prev */ arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE); - priv->previous_button = gtk_tool_button_new (arrow, Q_("Find Previous")); + priv->previous_button = gtk_tool_button_new (arrow, Q_("Find Pre_vious")); + gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (priv->previous_button), TRUE); gtk_tool_item_set_is_important (priv->previous_button, TRUE); - gtk_tool_item_set_tooltip (priv->previous_button, GTK_TOOLBAR (find_bar)->tooltips, - _("Find previous occurrence of the search string"), - NULL); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->previous_button), + _("Find previous occurrence of the search string")); /* Next */ arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE); - priv->next_button = gtk_tool_button_new (arrow, Q_("Find Next")); + priv->next_button = gtk_tool_button_new (arrow, Q_("Find Ne_xt")); + gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (priv->next_button), TRUE); gtk_tool_item_set_is_important (priv->next_button, TRUE); - gtk_tool_item_set_tooltip (priv->next_button, GTK_TOOLBAR (find_bar)->tooltips, - _("Find next occurrence of the search string"), - NULL); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->next_button), + _("Find next occurrence of the search string")); /* Separator*/ priv->status_separator = gtk_separator_tool_item_new(); @@ -347,9 +347,9 @@ egg_find_bar_init (EggFindBar *find_bar) priv->case_button = gtk_toggle_tool_button_new (); g_object_set (G_OBJECT (priv->case_button), "label", _("C_ase Sensitive"), NULL); gtk_tool_item_set_is_important (priv->case_button, TRUE); - gtk_tool_item_set_tooltip (priv->case_button, GTK_TOOLBAR (find_bar)->tooltips, - _("Toggle case sensitive help"), - NULL); + gtk_widget_set_tooltip_text (GTK_WIDGET (priv->case_button), + _("Toggle case sensitive search")); + /* Status */ priv->status_item = gtk_tool_item_new(); gtk_tool_item_set_expand (priv->status_item, TRUE);