Index: cddb-slave2/cddb-slave-capplet.c
===================================================================
RCS file: /cvs/gnome/gnome-media/cddb-slave2/cddb-slave-capplet.c,v
retrieving revision 1.15
diff -u -r1.15 cddb-slave-capplet.c
--- cddb-slave2/cddb-slave-capplet.c	16 Jul 2003 08:19:23 -0000	1.15
+++ cddb-slave2/cddb-slave-capplet.c	16 Jul 2003 14:23:42 -0000
@@ -646,13 +646,17 @@
 	PropertyDialog *pd;
 
 	GtkWidget *main_vbox;
-	GtkWidget *frame;
+	GtkWidget *table;
 	GtkWidget *align;
 	GtkWidget *vbox, *hbox;
 	GtkWidget *label, *sw;
+	GtkWidget *icon;
 	GtkCellRenderer *cell;
 	GtkTreeViewColumn *col;
 	GtkTreeSelection *selection;
+
+	PangoAttrList *attrlist;
+	PangoAttribute *attr_bold;
 	
 	char *str;
 	int info = CDDB_SEND_FAKE_INFO;
@@ -663,17 +667,40 @@
 	g_signal_connect (G_OBJECT (window), "destroy",
 			  G_CALLBACK (destroy_window), pd);
 
-	main_vbox = gtk_vbox_new (FALSE, 5);
+	main_vbox = gtk_vbox_new (FALSE, 18);
 	gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 5);
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (window)->vbox), main_vbox, TRUE, TRUE, 0);
 
-	/* Log on info */
-	frame = gtk_frame_new (_("Log on information"));
-	gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
-
-	vbox = gtk_vbox_new (FALSE, 4);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
+	/* Create the Pango attributes we need for the category descriptions */
+	attrlist = pango_attr_list_new ();
+
+	attr_bold = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
+	attr_bold->start_index = 0;
+	attr_bold->end_index   = G_MAXUINT;
+	pango_attr_list_insert (attrlist, attr_bold);
+
+	/* Login info */
+	table = gtk_table_new (2, 2, FALSE);
+	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+	gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
+
+	label = gtk_label_new ("Login Information");
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+	gtk_label_set_attributes (GTK_LABEL (label), attrlist);
+	gtk_table_attach (GTK_TABLE (table), label,
+			  0, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL,
+			  0, 0);
+
+	label = gtk_label_new (NULL);
+	gtk_widget_set_size_request (label, 12, -1);
+	gtk_table_attach (GTK_TABLE (table), label,
+			  0, 1, 1, 2, GTK_FILL, GTK_FILL,
+			  0, 0);
+
+	vbox = gtk_vbox_new (FALSE, 6);
+	gtk_table_attach (GTK_TABLE (table), vbox,
+			  1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL,
+			  0, 0);
 
 	info = gconf_client_get_int (client, "/apps/CDDB-Slave2/info", NULL);
 	g_print ("info: %d\n", info);
@@ -686,7 +713,7 @@
 	gtk_box_pack_start (GTK_BOX (vbox), pd->no_info, FALSE, FALSE, 0);
 
 	pd->real_info = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (pd->no_info),
-									_("Send real _information"));
+									_("Send _real information"));
 	if (info == CDDB_SEND_REAL_INFO) {
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pd->real_info), TRUE);
 	}
@@ -695,7 +722,7 @@
 	gtk_box_pack_start (GTK_BOX (vbox), pd->real_info, FALSE, FALSE, 0);
 
 	pd->specific_info = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (pd->real_info),
-									    _("Send _other information..."));
+									    _("Send _other information:"));
 	if (info == CDDB_SEND_OTHER_INFO) {
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pd->specific_info), TRUE);
 	}
@@ -711,7 +738,7 @@
 	
 	gtk_box_pack_start (GTK_BOX (vbox), pd->name_box, FALSE, FALSE, 0);
 	
-	align = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
+	align = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
 	label = gtk_label_new_with_mnemonic (_("N_ame:"));
 	gtk_container_add (GTK_CONTAINER (align), label);
 	gtk_table_attach (GTK_TABLE (pd->name_box), align,
@@ -731,8 +758,8 @@
 			  1, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL,
 			  0, 0);
 
-	align = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
-	label = gtk_label_new_with_mnemonic (_("_Hostname:"));
+	align = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
+	label = gtk_label_new_with_mnemonic (_("Ho_stname:"));
 	gtk_container_add (GTK_CONTAINER (align), label);
 	gtk_table_attach (GTK_TABLE (pd->name_box), align,
 			  0, 1, 1, 2, GTK_FILL, GTK_FILL,
@@ -751,30 +778,45 @@
 			  1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL,
 			  0, 0);
 
-	gtk_table_set_row_spacings (GTK_TABLE (pd->name_box), GNOME_PAD_SMALL);
-	gtk_table_set_col_spacings (GTK_TABLE (pd->name_box), GNOME_PAD_SMALL);
+	gtk_table_set_row_spacings (GTK_TABLE (pd->name_box), 6);
+	gtk_table_set_col_spacings (GTK_TABLE (pd->name_box), 12);
+
+	/* Login info */
+	table = gtk_table_new (2, 2, FALSE);
+	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
+	gtk_box_pack_start (GTK_BOX (main_vbox), table, TRUE, TRUE, 0);
+
+	label = gtk_label_new ("Server");
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+	gtk_label_set_attributes (GTK_LABEL (label), attrlist);
+	gtk_table_attach (GTK_TABLE (table), label,
+			  0, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL,
+			  0, 0);
+
+	label = gtk_label_new (NULL);
+	gtk_widget_set_size_request (label, 12, -1);
+	gtk_table_attach (GTK_TABLE (table), label,
+			  0, 1, 1, 2, GTK_FILL, GTK_FILL,
+			  0, 0);
 
-	/* Server info */
-	frame = gtk_frame_new (_("Server"));
-	gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
-
-	vbox = gtk_vbox_new (FALSE, 4);
-	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
-	gtk_container_add (GTK_CONTAINER (frame), vbox);
+	vbox = gtk_vbox_new (FALSE, 6);
+	gtk_table_attach (GTK_TABLE (table), vbox,
+			  1, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,
+			  0, 0);
 
 	info = gconf_client_get_int (client, "/apps/CDDB-Slave2/server-type", NULL);
-	pd->round_robin = gtk_radio_button_new_with_mnemonic (NULL, _("FreeDB _round robin server"));
+	pd->round_robin = gtk_radio_button_new_with_mnemonic (NULL, _("_FreeDB round robin server"));
 	g_signal_connect (G_OBJECT (pd->round_robin), "toggled",
 			  G_CALLBACK (round_robin_toggled), pd);
 	gtk_box_pack_start (GTK_BOX (vbox), pd->round_robin, FALSE, FALSE, 0);
 
 	pd->other_freedb = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (pd->round_robin),
-									   _("Other _FreeDB server..."));
+									   _("O_ther FreeDB server:"));
 	g_signal_connect (G_OBJECT (pd->other_freedb), "toggled",
 			  G_CALLBACK (other_freedb_toggled), pd);
 	gtk_box_pack_start (GTK_BOX (vbox), pd->other_freedb, FALSE, FALSE, 0);
 
-	pd->freedb_box = gtk_vbox_new (FALSE, 0);
+	pd->freedb_box = gtk_vbox_new (FALSE, 6);
 	gtk_widget_set_sensitive (pd->freedb_box, FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox), pd->freedb_box, TRUE, TRUE, 0);
 
@@ -784,7 +826,7 @@
 					GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
 					     GTK_SHADOW_IN);
-	gtk_box_pack_start (GTK_BOX (pd->freedb_box), sw, TRUE, TRUE, 2);
+	gtk_box_pack_start (GTK_BOX (pd->freedb_box), sw, TRUE, TRUE, 0);
 	
 	pd->model = make_tree_model ();
 	pd->freedb_server = gtk_tree_view_new_with_model (pd->model);
@@ -807,14 +849,37 @@
 	
 	gtk_container_add (GTK_CONTAINER (sw), pd->freedb_server);
 
-	pd->update = gtk_button_new_with_label (_("Update server list"));
+	/* create the update server list button */
+	align = gtk_alignment_new (1.0, 0.5, 0.0, 0.0);
+
+	pd->update = gtk_button_new ();
 	g_signal_connect (G_OBJECT (pd->update), "clicked",
 			  G_CALLBACK (update_clicked), pd);
+
+	gtk_container_add (GTK_CONTAINER (align), pd->update);
 	
-	gtk_box_pack_start (GTK_BOX (pd->freedb_box), pd->update, FALSE, FALSE, 2);
+	gtk_box_pack_start (GTK_BOX (pd->freedb_box), align, FALSE, FALSE, 0);
+
+	/* ... and it's contents */
+	align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+	gtk_container_add (GTK_CONTAINER (pd->update), align);
+
+	hbox = gtk_hbox_new (FALSE, 2);
+
+	gtk_container_add (GTK_CONTAINER (align), hbox);
+
+	icon = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
+
+	gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
+
+	label = gtk_label_new_with_mnemonic (_("_Update Server List"));
+
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), pd->update);
+
+	gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
 	pd->other_server = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (pd->other_freedb),
-									   _("Other _server..."));
+									   _("Oth_er server:"));
 	g_signal_connect (G_OBJECT (pd->other_server), "toggled",
 			  G_CALLBACK (other_server_toggled), pd);
 	gtk_box_pack_start (GTK_BOX (vbox), pd->other_server, FALSE, FALSE, 0);
@@ -823,13 +888,14 @@
 	gtk_widget_set_sensitive (pd->other_box, FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox), pd->other_box, FALSE, FALSE, 0);
 
-	hbox = gtk_hbox_new (FALSE, 4);
+	hbox = gtk_hbox_new (FALSE, 12);
 	gtk_box_pack_start (GTK_BOX (pd->other_box), hbox, TRUE, TRUE, 0);
 	
-	label = gtk_label_new (_("Hostname:"));
+	label = gtk_label_new_with_mnemonic (_("Hostna_me:"));
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
 	pd->other_host = gtk_entry_new ();
+	gtk_label_set_mnemonic_widget (GTK_LABEL (label), pd->other_host);
 	g_signal_connect (G_OBJECT (pd->other_host), "changed",
 			  G_CALLBACK (other_host_changed), pd);
 	str = gconf_client_get_string (client, "/apps/CDDB-Slave2/server", NULL);
@@ -896,6 +962,8 @@
 						  GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 						  NULL);
 	gtk_window_set_default_size (GTK_WINDOW (dialog_win), 440, 570);
+	gtk_container_set_border_width (GTK_CONTAINER (dialog_win), 5);
+	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog_win)->vbox), 2);
 	create_dialog (dialog_win);
 
 	gtk_dialog_set_default_response(GTK_DIALOG (dialog_win), GTK_RESPONSE_CLOSE);
