Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libsounds/libsounds/ChangeLog,v
retrieving revision 1.24
diff -u -p -r1.24 ChangeLog
--- ChangeLog	24 Nov 2002 05:15:26 -0000	1.24
+++ ChangeLog	14 Dec 2002 18:53:56 -0000
@@ -1,3 +1,14 @@
+2002-12-14  Dennis Cranston <dennis_cranston@yahoo.com>
+
+	* sound-view.c:  Fixes for ui-review bug number 99533.
+	  - s/File to play/Sound File,
+	  - HIG Frame stuff,
+	  - Play button looks better to the right of the Browse button,
+	  - Columns aren't resizable,
+	  - Can't click on the column headers to sort them,
+	  - Text entry should have label "Sound File" and mnemonic - above
+	    text entry to allow field to be wider.
+	
 2002-11-23  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.1.3
Index: sound-view.c
===================================================================
RCS file: /cvs/gnome/libsounds/libsounds/sound-view.c,v
retrieving revision 1.18
diff -u -p -r1.18 sound-view.c
--- sound-view.c	11 Sep 2002 13:24:24 -0000	1.18
+++ sound-view.c	14 Dec 2002 18:53:59 -0000
@@ -20,6 +20,7 @@ struct _SoundViewPrivate
 	SoundProperties *props;
 	GtkWidget *play_button;
 	GtkWidget *entry;
+	GtkWidget *label;
 	GHashTable *event2path;
 	GSList *paths;
 	gboolean ignore_changed;
@@ -217,14 +218,18 @@ sound_view_init (GtkObject *object)
 							   renderer,
 							   "text", EVENT_COLUMN,
 							   NULL);
-	gtk_tree_view_column_set_clickable (column, FALSE);
+	gtk_tree_view_column_set_clickable (column, TRUE);
+	gtk_tree_view_column_set_resizable (column, TRUE);
+	gtk_tree_view_column_set_sort_column_id (column, EVENT_COLUMN);
 	gtk_tree_view_append_column (view->priv->view, column);
 
-	column = gtk_tree_view_column_new_with_attributes (_("File to play"),
+	column = gtk_tree_view_column_new_with_attributes (_("Sound File"),
 							   renderer,
 							   "text", FILE_COLUMN,
 							   NULL);
-	gtk_tree_view_column_set_clickable (column, FALSE);
+	gtk_tree_view_column_set_clickable (column, TRUE);
+	gtk_tree_view_column_set_resizable (column, TRUE);
+	gtk_tree_view_column_set_sort_column_id (column, FILE_COLUMN);
 	gtk_tree_view_append_column (view->priv->view, column);
 
 	widget = gtk_scrolled_window_new (NULL, NULL);
@@ -232,10 +237,13 @@ sound_view_init (GtkObject *object)
 					GTK_POLICY_ALWAYS,
 					GTK_POLICY_ALWAYS);
 	gtk_widget_set_size_request (widget, 350, -1);
+	gtk_container_set_border_width (GTK_CONTAINER (widget), GNOME_PAD_SMALL);
 	gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (view->priv->view));
 
 	frame = gtk_frame_new ("");
-	label = gtk_label_new_with_mnemonic (_("_Sounds"));
+	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+	label = gtk_label_new_with_mnemonic (_("<b>_Sounds</b>"));
+	gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label),
 				       GTK_WIDGET (view->priv->view));
 	gtk_frame_set_label_widget (GTK_FRAME (frame), label);
@@ -246,30 +254,38 @@ sound_view_init (GtkObject *object)
 
 	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (view), hbox, FALSE, FALSE, GNOME_PAD);
-	view->priv->play_button = gtk_button_new ();
-	bbox = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (bbox), gtk_image_new_from_stock (GNOME_STOCK_VOLUME, GTK_ICON_SIZE_BUTTON), FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (bbox), gtk_label_new_with_mnemonic (_("_Play")), FALSE, FALSE, GNOME_PAD);
-	gtk_container_add (GTK_CONTAINER (view->priv->play_button), bbox);
-	gtk_box_pack_start (GTK_BOX (hbox), view->priv->play_button, TRUE, FALSE, GNOME_PAD_SMALL);
-	g_object_set_data (G_OBJECT (view->priv->play_button), "gnome_disable_sound_events", GINT_TO_POINTER(1));
-	g_signal_connect (G_OBJECT (view->priv->play_button), "clicked", (GCallback) play_cb, view);
+
+	view->priv->label = gtk_vbox_new (FALSE, 0);
+	label = gtk_label_new_with_mnemonic (_("Sound _file:"));
+	g_object_set (G_OBJECT (label), "xalign", 0.0, NULL);
+	gtk_box_pack_start (GTK_BOX (view->priv->label), label, FALSE, FALSE, 0);
 
 	view->priv->entry = gnome_file_entry_new (NULL, _("Select sound file"));
 	gnome_file_entry_set_modal (GNOME_FILE_ENTRY (view->priv->entry), TRUE);
 	path = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_DATADIR, "sounds/", TRUE, NULL);
 	gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (view->priv->entry), path);
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), view->priv->entry);
 	g_free (path);
 
 	g_signal_connect (G_OBJECT (gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (view->priv->entry))), "changed",
 			  (GCallback) entry_changed_cb, view);
 				       
 	vbox = gtk_vbox_new (FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), view->priv->label, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), view->priv->entry, FALSE, FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, FALSE, GNOME_PAD_SMALL);
+	gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, GNOME_PAD_SMALL);
 
+	view->priv->play_button = gtk_button_new ();
+	bbox = gtk_hbox_new (FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (bbox), gtk_image_new_from_stock (GNOME_STOCK_VOLUME, GTK_ICON_SIZE_BUTTON), FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (bbox), gtk_label_new_with_mnemonic (_("_Play")), FALSE, FALSE, GNOME_PAD);
+	gtk_container_add (GTK_CONTAINER (view->priv->play_button), bbox);
+	gtk_box_pack_start (GTK_BOX (hbox), view->priv->play_button, FALSE, FALSE, GNOME_PAD_SMALL);
+	g_object_set_data (G_OBJECT (view->priv->play_button), "gnome_disable_sound_events", GINT_TO_POINTER(1));
+	g_signal_connect (G_OBJECT (view->priv->play_button), "clicked", (GCallback) play_cb, view);
 
 	gtk_widget_set_sensitive (view->priv->play_button, FALSE);
+	gtk_widget_set_sensitive (view->priv->label, FALSE);	
 	gtk_widget_set_sensitive (view->priv->entry, FALSE);
 	
 	gtk_widget_show_all (hbox);
@@ -407,10 +423,12 @@ select_row_cb (GtkTreeSelection *sel, So
 		}
 
 		gtk_widget_set_sensitive (view->priv->play_button, TRUE);
+		gtk_widget_set_sensitive (view->priv->label, TRUE);
 		gtk_widget_set_sensitive (view->priv->entry, TRUE);
 	} else {
 		text = g_strdup ("");
 		gtk_widget_set_sensitive (view->priv->play_button, FALSE);
+		gtk_widget_set_sensitive (view->priv->label, FALSE);
 		gtk_widget_set_sensitive (view->priv->entry, FALSE);
 	}
 
