Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-utils/gnome-dictionary/ChangeLog,v
retrieving revision 1.2
diff -u -p -r1.2 ChangeLog
--- ChangeLog	16 Dec 2005 17:27:58 -0000	1.2
+++ ChangeLog	17 Dec 2005 17:59:20 -0000
@@ -1,3 +1,11 @@
+2005-12-17  Dennis Cranston <dennis_cranston@yahoo.com>
+
+	* src/gdict-window.c:  UI fixes.  Fix widget spacing.  Change 
+	"find" back to "look up" to avoid confusion caused by its 
+	double use.
+
+	* libgdict/gdict-defbox.c:  UI fixes for the find widgets.
+
 2005-12-15  Emmanuele Bassi  <ebassi@cvs.gnome.org>
 
 	* src/gdict-applet.h, src/gdict-applet.c: create the dictionary applet.
Index: libgdict/gdict-defbox.c
===================================================================
RCS file: /cvs/gnome/gnome-utils/gnome-dictionary/libgdict/gdict-defbox.c,v
retrieving revision 1.2
diff -u -p -r1.2 gdict-defbox.c
--- libgdict/gdict-defbox.c	16 Dec 2005 17:32:35 -0000	1.2
+++ libgdict/gdict-defbox.c	17 Dec 2005 17:59:21 -0000
@@ -317,17 +317,23 @@ find_prev_clicked_cb (GtkWidget *widget,
   GdictDefbox *defbox = GDICT_DEFBOX (user_data);
   GdictDefboxPrivate *priv = defbox->priv;
   const gchar *text;
+  gchar *str;
   gboolean res;
 
   gtk_label_set_text (GTK_LABEL (priv->find_label), "");
+  gtk_widget_hide (priv->find_label);
   
   text = gtk_entry_get_text (GTK_ENTRY (priv->find_entry));
   if (!text)
     return;
   
   res = gdict_defbox_find_backward (defbox, text);
-  if (!res)
-    gtk_label_set_text (GTK_LABEL (priv->find_label), _("Not found"));
+  if (!res) {
+    str = g_strconcat ("  <i>", _("Not found"), "</i>", NULL);
+    gtk_label_set_markup (GTK_LABEL (priv->find_label), str);
+    gtk_widget_show (priv->find_label);
+    g_free (str);
+  }
 }
 
 static gboolean
@@ -384,17 +390,23 @@ find_next_clicked_cb (GtkWidget *widget,
   GdictDefbox *defbox = GDICT_DEFBOX (user_data);
   GdictDefboxPrivate *priv = defbox->priv;
   const gchar *text;
+  gchar *str;
   gboolean res;
   
   gtk_label_set_text (GTK_LABEL (priv->find_label), "");
+  gtk_widget_hide (priv->find_label);
   
   text = gtk_entry_get_text (GTK_ENTRY (priv->find_entry));
   if (!text)
     return;
   
   res = gdict_defbox_find_forward (defbox, text);
-  if (!res)
-    gtk_label_set_text (GTK_LABEL (priv->find_label), _("Not found"));
+  if (!res) {
+    str = g_strconcat ("  <i>", _("Not found"), "</i>", NULL);
+    gtk_label_set_markup (GTK_LABEL (priv->find_label), str);
+    gtk_widget_show (priv->find_label);
+    g_free (str);
+  }
 }
 
 static void
@@ -404,17 +416,23 @@ find_entry_changed_cb (GtkWidget *widget
   GdictDefbox *defbox = GDICT_DEFBOX (user_data);
   GdictDefboxPrivate *priv = defbox->priv;
   const gchar *text;
+  gchar *str;
   gboolean found;
 
   gtk_label_set_text (GTK_LABEL (priv->find_label), "");
+  gtk_widget_hide (priv->find_label);
   
   text = gtk_entry_get_text (GTK_ENTRY (widget));
   if (strlen (text) == 0)
     return;
 
   found = gdict_defbox_find_forward (defbox, text);
-  if (!found)
-    gtk_label_set_text (GTK_LABEL (priv->find_label), _("Not found"));
+  if (!found) {
+    str = g_strconcat ("  <i>", _("Not found"), "</i>", NULL);
+    gtk_label_set_markup (GTK_LABEL (priv->find_label), str);
+    gtk_widget_show (priv->find_label);
+    g_free (str);
+  }
 }
 
 static void
@@ -423,22 +441,29 @@ create_find_pane (GdictDefbox *defbox)
   GdictDefboxPrivate *priv;
   GtkWidget *label;
   GtkWidget *sep;
+  GtkWidget *hbox;
+  GtkWidget *hbox2;
  
   priv = defbox->priv;  
   
-  priv->find_pane = gtk_hbox_new (FALSE, 6);
-  gtk_container_set_border_width (GTK_CONTAINER (priv->find_pane), 1);
+  priv->find_pane = gtk_hbox_new (FALSE, 12);
+  gtk_container_set_border_width (GTK_CONTAINER (priv->find_pane), 0);
   
-  label = gtk_label_new (_("Find:"));
+  label = gtk_label_new_with_mnemonic (_("F_ind:"));
   gtk_box_pack_start (GTK_BOX (priv->find_pane), label, FALSE, FALSE, 0);
+
+  hbox = gtk_hbox_new (FALSE, 6);
+  gtk_box_pack_start (GTK_BOX (priv->find_pane), hbox, TRUE, TRUE, 0);
+  gtk_widget_show (hbox);
   
   priv->find_entry = gtk_entry_new ();
   g_signal_connect (priv->find_entry, "changed",
   		    G_CALLBACK (find_entry_changed_cb), defbox);
-  gtk_box_pack_start (GTK_BOX (priv->find_pane), priv->find_entry, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), priv->find_entry, TRUE, TRUE, 0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->find_entry);
   
   sep = gtk_vseparator_new ();
-  gtk_box_pack_start (GTK_BOX (priv->find_pane), sep, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), sep, FALSE, FALSE, 0);
   
   priv->find_prev = gtk_button_new_with_mnemonic (_("Find _Prev"));
   gtk_button_set_image (GTK_BUTTON (priv->find_prev),
@@ -446,7 +471,10 @@ create_find_pane (GdictDefbox *defbox)
   						  GTK_ICON_SIZE_MENU));
   g_signal_connect (priv->find_prev, "clicked",
   		    G_CALLBACK (find_prev_clicked_cb), defbox);
-  gtk_box_pack_start (GTK_BOX (priv->find_pane), priv->find_prev, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), priv->find_prev, FALSE, FALSE, 0);
+
+  hbox2 = gtk_hbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
 
   priv->find_next = gtk_button_new_with_mnemonic (_("Find _Next"));
   gtk_button_set_image (GTK_BUTTON (priv->find_next),
@@ -454,10 +482,12 @@ create_find_pane (GdictDefbox *defbox)
   						  GTK_ICON_SIZE_MENU));
   g_signal_connect (priv->find_next, "clicked",
   		    G_CALLBACK (find_next_clicked_cb), defbox);
-  gtk_box_pack_start (GTK_BOX (priv->find_pane), priv->find_next, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox2), priv->find_next, FALSE, FALSE, 0);
   
   priv->find_label = gtk_label_new (NULL);
-  gtk_box_pack_end (GTK_BOX (priv->find_pane), priv->find_label, FALSE, FALSE, 0);
+  gtk_label_set_use_markup ( GTK_LABEL (priv->find_label), TRUE);
+  gtk_box_pack_end (GTK_BOX (hbox2), priv->find_label, FALSE, FALSE, 0);
+  gtk_widget_hide (priv->find_label);
 }
 
 static void
@@ -503,6 +533,7 @@ gdict_defbox_default_constructor (GType 
   						   n_construct_properties,
   						   construct_params);
   defbox = GDICT_DEFBOX (object);
+  gtk_box_set_spacing (GTK_BOX (defbox), 6);
   priv = defbox->priv;
   
   gtk_widget_push_composite_child ();
Index: src/gdict-window.c
===================================================================
RCS file: /cvs/gnome/gnome-utils/gnome-dictionary/src/gdict-window.c,v
retrieving revision 1.2
diff -u -p -r1.2 gdict-window.c
--- src/gdict-window.c	16 Dec 2005 17:36:02 -0000	1.2
+++ src/gdict-window.c	17 Dec 2005 17:59:21 -0000
@@ -327,7 +327,7 @@ gdict_window_cmd_edit_preferences (GtkAc
   GtkWidget *pref_dialog;
   
   pref_dialog = gdict_pref_dialog_new (GTK_WINDOW (window),
-  				       _("Preferences"),
+  				       _("Dictionary Preferences"),
   				       window->loader);
   
   gtk_dialog_run (GTK_DIALOG (pref_dialog));
@@ -471,7 +471,7 @@ static const GtkActionEntry entries[] =
     G_CALLBACK (gdict_window_cmd_edit_find_next) },
   { "EditFindPrevious", NULL, N_("Find Pre_vious"), "<control><shift>G", NULL,
     G_CALLBACK (gdict_window_cmd_edit_find_previous) },
-  { "EditPreferences", NULL, N_("_Preferences"), NULL, NULL,
+  { "EditPreferences", GTK_STOCK_PREFERENCES, N_("_Preferences"), NULL, NULL,
     G_CALLBACK (gdict_window_cmd_edit_preferences) },
 
   /* Go menu */
@@ -709,6 +709,7 @@ gdict_window_constructor (GType         
   GObject *object;
   GdictWindow *window;
   GtkWidget *hbox;
+  GtkWidget *vbox;
   GtkWidget *label;
   GtkActionGroup *action_group;
   GtkAccelGroup *accel_group;
@@ -727,7 +728,7 @@ gdict_window_constructor (GType         
   			       GDICT_WINDOW_MIN_WIDTH,
   			       GDICT_WINDOW_MIN_HEIGHT);
  
-  window->main_box = gtk_vbox_new (FALSE, 12);
+  window->main_box = gtk_vbox_new (FALSE, 0);
   gtk_container_add (GTK_CONTAINER (window), window->main_box);
   gtk_widget_show (window->main_box);
   
@@ -761,11 +762,16 @@ gdict_window_constructor (GType         
       gtk_widget_show (window->menubar);
     }
   
-  hbox = gtk_hbox_new (FALSE, 6);
-  gtk_box_pack_start (GTK_BOX (window->main_box), hbox, FALSE, FALSE, 0);
+  vbox = gtk_vbox_new (FALSE, 6);
+  gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
+  gtk_container_add (GTK_CONTAINER (window->main_box), vbox);
+  gtk_widget_show (vbox);
+  
+  hbox = gtk_hbox_new (FALSE, 12);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
   
-  label = gtk_label_new_with_mnemonic (_("F_ind:"));
+  label = gtk_label_new_with_mnemonic (_("Look _up:"));
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
   
@@ -789,7 +795,7 @@ gdict_window_constructor (GType         
   g_signal_connect (window->defbox, "drag-data-received",
   		    G_CALLBACK (gdict_window_drag_data_received_cb),
   		    window);
-  gtk_box_pack_start (GTK_BOX (window->main_box), window->defbox, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), window->defbox, TRUE, TRUE, 0);
   gtk_widget_show_all (window->defbox);
 
   window->status = gtk_statusbar_new ();
