Index: file-manager/fm-properties-window.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/file-manager/fm-properties-window.c,v
retrieving revision 1.209
diff -u -r1.209 fm-properties-window.c
--- file-manager/fm-properties-window.c	18 Feb 2005 08:05:27 -0000	1.209
+++ file-manager/fm-properties-window.c	18 Feb 2005 22:59:24 -0000
@@ -2238,11 +2238,11 @@
 	GtkTable *table;
 	GtkWidget *container;
 	GtkWidget *name_field;
-	GtkWidget *icon_aligner;
 	GtkWidget *icon_pixmap_widget;
-
-	GtkWidget *hbox, *name_label;
-
+	GtkWidget *hbox;
+	GtkLabel *name_label;
+	guint last_row;
+	
 	create_page_with_table_in_vbox (window->details->notebook, 
 					_("Basic"), 
 					1,
@@ -2250,35 +2250,12 @@
 					&container);
 	window->details->basic_table = table;
 	
-	/* Icon pixmap */
-	hbox = gtk_hbox_new (FALSE, 4);
-	gtk_widget_show (hbox);
-	gtk_table_attach (table,
-			  hbox,
-			  TITLE_COLUMN, 
-			  TITLE_COLUMN + 1,
-			  0, 1,
-			  0, 0,
-			  0, 0);
-
-	icon_pixmap_widget = create_image_widget (window);
-	gtk_widget_show (icon_pixmap_widget);
-	
-	icon_aligner = gtk_alignment_new (1, 0.5, 0, 0);
-	gtk_widget_show (icon_aligner);
-	
-	gtk_container_add (GTK_CONTAINER (icon_aligner), icon_pixmap_widget);
-	gtk_box_pack_start (GTK_BOX (hbox), icon_aligner, TRUE, TRUE, 0);
-
 	/* Name label */
 	if (is_multi_file_window (window)) {
-		name_label = gtk_label_new_with_mnemonic (_("_Names:"));
+		last_row = append_title_field (table, _("_Names:"), &name_label);
 	} else {
-		name_label = gtk_label_new_with_mnemonic (_("_Name:"));
+		last_row = append_title_field (table, _("_Name:"), &name_label);
 	}
-	eel_gtk_label_make_bold (GTK_LABEL (name_label));
-	gtk_widget_show (name_label);
-	gtk_box_pack_end (GTK_BOX (hbox), name_label, FALSE, FALSE, 0);
 
 	/* Name field */
 	name_field = nautilus_entry_new ();
@@ -2288,10 +2265,10 @@
 			  name_field,
 			  VALUE_COLUMN, 
 			  VALUE_COLUMN + 1,
-			  0, 1,
+			  last_row, last_row + 1,
 			  GTK_FILL, 0,
 			  0, 0);
-	gtk_label_set_mnemonic_widget (GTK_LABEL (name_label), name_field);
+	gtk_label_set_mnemonic_widget (name_label, name_field);
 
 	/* Update name field initially before hooking up changed signal. */
 	update_name_field (window);
@@ -2384,26 +2361,43 @@
 					 _("--"),
 					 FALSE);
 	}
+	
+	/* Blank title ensures standard row height */
+	append_title_field (table, "", NULL);
+	
+	/* Icon pixmap */
+	last_row = append_title_field (table, _("Icon:"), NULL);
+	hbox = gtk_hbox_new (FALSE, 12);
+	gtk_widget_show (hbox);
+	gtk_table_attach (table,
+			  hbox,
+			  VALUE_COLUMN, 
+			  VALUE_COLUMN + 1,
+			  last_row, last_row + 1,
+			  GTK_FILL, 0,
+			  0, 0);
+	icon_pixmap_widget = create_image_widget (window);
+	gtk_widget_show (icon_pixmap_widget);
 
 	if (should_show_custom_icon_buttons (window)) {
-		GtkWidget *button_box;
 		GtkWidget *temp_button;
+		GtkWidget *alignment; 
 		GList *l;
 		
-		/* add command buttons for setting and clearing custom icons */
-		button_box = gtk_hbox_new (FALSE, 0);
-		gtk_widget_show (button_box);
-		gtk_box_pack_end (GTK_BOX(container), button_box, FALSE, FALSE, 4);  
-		
-	 	temp_button = gtk_button_new_with_mnemonic (_("_Select Custom Icon..."));
+		temp_button = gtk_button_new ();
+		gtk_container_add (GTK_CONTAINER (temp_button), icon_pixmap_widget);
 		gtk_widget_show (temp_button);
-		gtk_box_pack_start (GTK_BOX (button_box), temp_button, FALSE, FALSE, 4);  
-
+		gtk_box_pack_start (GTK_BOX (hbox), temp_button, FALSE, FALSE, 0);
+		
 		g_signal_connect_object (temp_button, "clicked", G_CALLBACK (select_image_button_callback), window, 0);
-	 	
+		
+		alignment = gtk_alignment_new (0, 0.5, 1, 0);
+		gtk_widget_show (alignment);
+		gtk_box_pack_start (GTK_BOX (hbox), alignment, FALSE, FALSE, 0);
+		
 	 	temp_button = gtk_button_new_with_mnemonic (_("_Remove Custom Icon"));
 		gtk_widget_show (temp_button);
-		gtk_box_pack_start (GTK_BOX(button_box), temp_button, FALSE, FALSE, 4);  
+		gtk_container_add (GTK_CONTAINER (alignment), temp_button);
 
 	 	g_signal_connect_object (temp_button, "clicked", G_CALLBACK (remove_image_button_callback), window, 0);
 
@@ -2425,6 +2419,10 @@
 
 		window->details->icon_selector_window = NULL;
 	}
+	else
+	{
+		gtk_box_pack_start (GTK_BOX (hbox), icon_pixmap_widget, FALSE, FALSE, 0);
+	}
 }
 
 static GHashTable *
@@ -3339,6 +3337,7 @@
 	gtk_window_set_wmclass (GTK_WINDOW (window), "file_properties", "Nautilus");
 	gtk_window_set_screen (GTK_WINDOW (window),
 			       gtk_widget_get_screen (startup_data->parent_widget));
+	gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
 	/* Set initial window title */
 	update_properties_window_title (window);
