change buttons to previous/next instead of back/forward

2004-12-21  Havoc Pennington  <hp@redhat.com>

	* shell/eggfindbar.c (egg_find_bar_init): change buttons to
	previous/next instead of back/forward

diff --git a/ChangeLog b/ChangeLog
index 0239df9e36043647ba03cd9375a33f5fc63a271f..d82900e881e8fa78de126de75130ee68d1b248d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-21  Havoc Pennington  <hp@redhat.com>
+
+       * shell/eggfindbar.c (egg_find_bar_init): change buttons to
+       previous/next instead of back/forward
+
 Tue Dec 21 18:26:24 2004  Owen Taylor  <otaylor@redhat.com>
 
        * backend/ev-document.[ch]: Fix a couple of problems so

diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c
index c81120ce80217eaaa79af0691a5bcbdb9b6fbb54..4ce466266df64810416b6f8b3d293ed9280c77a4 100644 (file)
--- a/shell/eggfindbar.c
+++ b/shell/eggfindbar.c
@@ -266,6 +266,8 @@ egg_find_bar_init (EggFindBar *find_bar)
   GtkWidget *label;
   GtkWidget *separator;
   GtkWidget *image;
+  GtkWidget *image_back;
+  GtkWidget *image_forward;
 
   /* Data */
   priv = EGG_FIND_BAR_GET_PRIVATE (find_bar);
@@ -291,11 +293,35 @@ egg_find_bar_init (EggFindBar *find_bar)
   priv->find_entry = gtk_entry_new ();
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->find_entry);
   
-  priv->previous_button = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
-  priv->next_button = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
-
+  priv->previous_button = gtk_button_new_with_mnemonic (_("_Previous"));
+  priv->next_button = gtk_button_new_with_mnemonic (_("_Next"));
+
+  image_back = gtk_image_new_from_stock (GTK_STOCK_GO_BACK,
+                                         GTK_ICON_SIZE_BUTTON);
+  image_forward = gtk_image_new_from_stock (GTK_STOCK_GO_FORWARD,
+                                            GTK_ICON_SIZE_BUTTON);
+
+  gtk_button_set_image (GTK_BUTTON (priv->previous_button),
+                        image_back);
+  gtk_button_set_image (GTK_BUTTON (priv->next_button),
+                        image_forward);
+  
   priv->case_button = gtk_check_button_new_with_mnemonic (_("C_ase Sensitive"));
 
+#if 0
+ {
+   GtkWidget *button_label;
+   /* This hack doesn't work because GtkCheckButton doesn't pass the
+    * larger size allocation to the label, it always gives the label
+    * its exact request. If you un-ifdef this, set the box back
+    * on case_button to TRUE, TRUE below
+    */
+   button_label = gtk_bin_get_child (GTK_BIN (priv->case_button));
+   gtk_label_set_ellipsize (GTK_LABEL (button_label),
+                            PANGO_ELLIPSIZE_END);
+ }
+#endif
+  
   gtk_box_pack_start (GTK_BOX (priv->hbox),
                       priv->close_button, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (priv->hbox),
@@ -321,6 +347,8 @@ egg_find_bar_init (EggFindBar *find_bar)
   gtk_widget_show (separator);
   gtk_widget_show (label);
   gtk_widget_show (image);
+  gtk_widget_show (image_back);
+  gtk_widget_show (image_forward);
 
   gtk_widget_pop_composite_child ();