[evince/hildon-2-28] shell: [maemo5] Make the find toolbar fit without overflow items
- From: Christian Persch <chpe src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evince/hildon-2-28] shell: [maemo5] Make the find toolbar fit without overflow items
- Date: Thu, 26 Nov 2009 21:10:12 +0000 (UTC)
commit f0fe454edc995745c0c351a821216f014ec00d2d
Author: Christian Persch <chpe gnome org>
Date: Thu Nov 26 22:09:10 2009 +0100
shell: [maemo5] Make the find toolbar fit without overflow items
Needs to set icons-only mode on the findbar to avoid overflow of the
most often used item, Find Next.
data/gtkrc-hildon | 3 +++
shell/eggfindbar.c | 14 ++++++++++++++
2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/data/gtkrc-hildon b/data/gtkrc-hildon
index a4a719f..280ca5d 100644
--- a/data/gtkrc-hildon
+++ b/data/gtkrc-hildon
@@ -11,6 +11,9 @@ style "evince-icons" {
stock["gtk-goto-top"] = { { @"pdf_viewer_first_page", LTR }, { @"pdf_viewer_last_page", RTL } }
stock["gtk-goto-bottom"] = { { @"pdf_viewer_last_page", LTR }, { @"pdf_viewer_first_page", RTL } }
+ stock["gtk-go-back"] = { { @"general_back", LTR }, { @"general_forward", RTL } }
+ stock["gtk-go-forward"] = { { @"general_forward", LTR }, { @"general_back", RTL } }
+
stock["gtk-go-up"] = { { @"general_back", LTR }, { @"general_forward", RTL } }
stock["gtk-go-down"] = { { @"general_forward", LTR }, { @"general_back", RTL } }
diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c
index eabee11..dcbe5bb 100644
--- a/shell/eggfindbar.c
+++ b/shell/eggfindbar.c
@@ -300,7 +300,9 @@ egg_find_bar_init (EggFindBar *find_bar)
GtkWidget *alignment;
GtkWidget *box;
GtkToolItem *item;
+#ifndef PLATFORM_HILDON
GtkWidget *arrow;
+#endif
/* Data */
priv = EGG_FIND_BAR_GET_PRIVATE (find_bar);
@@ -308,7 +310,11 @@ egg_find_bar_init (EggFindBar *find_bar)
find_bar->priv = priv;
priv->search_string = NULL;
+#ifdef PLATFORM_HILDON
+ gtk_toolbar_set_style (GTK_TOOLBAR (find_bar), GTK_TOOLBAR_ICONS);
+#else
gtk_toolbar_set_style (GTK_TOOLBAR (find_bar), GTK_TOOLBAR_BOTH_HORIZ);
+#endif
/* Find: |_____| */
item = gtk_tool_item_new ();
@@ -325,16 +331,24 @@ egg_find_bar_init (EggFindBar *find_bar)
gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->find_entry);
/* Prev */
+#ifdef PLATFORM_HILDON
+ priv->previous_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
+#else
arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE);
priv->previous_button = gtk_tool_button_new (arrow, Q_("Find Pre_vious"));
+#endif
gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (priv->previous_button), TRUE);
gtk_tool_item_set_is_important (priv->previous_button, TRUE);
gtk_widget_set_tooltip_text (GTK_WIDGET (priv->previous_button),
_("Find previous occurrence of the search string"));
/* Next */
+#ifdef PLATFORM_HILDON
+ priv->next_button = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+#else
arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
priv->next_button = gtk_tool_button_new (arrow, Q_("Find Ne_xt"));
+#endif
gtk_tool_button_set_use_underline (GTK_TOOL_BUTTON (priv->next_button), TRUE);
gtk_tool_item_set_is_important (priv->next_button, TRUE);
gtk_widget_set_tooltip_text (GTK_WIDGET (priv->next_button),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]