- alphabetically sort help items

- add help for some cpu fields

1 files changed, 17 insertions, 12 deletions

diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
index 73ee3196f..39f409d91 100644
--- a/perl-install/harddrake/ui.pm
+++ b/perl-install/harddrake/ui.pm
@@ -11,30 +11,33 @@ use interactive;
 # { field => [ short_translation, full_description] }
 my %fields = 
     (
-	"Model" => [_("Model"), _("hard disk model")],
-	"channel" => [_("Channel"), _("EIDE/SCSI channel")],
+	"alternative_drivers" => [ _("Alternative drivers"),
+						  _("the list of alternative drivers for this sound card")],
 	"bus" => 
 	[ _("Bus"), 
 	  _("this is the physical bus on which the device is plugged (eg: PCI, USB, ...)")],
-	"driver" => [ _("Module"), _("the module of the GNU/Linux kernel that handle that device")],
-	"media_type" => [ _("Media class"), _("class of hardware device")],
-	"description" => [ _("Description"), _("this field describe the device")],
+	"channel" => [_("Channel"), _("EIDE/SCSI channel")],
 	"bus_id" => 
 	[ _("Bus identification"), 
 	  _("- PCI and USB devices: this list the vendor, device, subvendor and subdevice PCI/USB ids")],
 	"bus_location" => 
-	[ _("Location on the bus"), 
-	  _("- pci devices: this gives the PCI slot, device and function of this card
-- eide devices: the device is either a slave or a master device
-- scsi devices: the scsi bus and the scsi device ids")],
+	"description" => [ _("Description"), _("this field describe the device")],
 	"device" => [ _("Old device file"),
 			    _("old static device name used in dev package")],
 	"devfs_device" => [ _("New devfs device"),  
 					_("new dinamic device name generated by incore kernel devfs")],
+	"driver" => [ _("Module"), _("the module of the GNU/Linux kernel that handle that device")],
+	[ _("Location on the bus"), 
+	  _("- pci devices: this gives the PCI slot, device and function of this card
+- eide devices: the device is either a slave or a master device
+- scsi devices: the scsi bus and the scsi device ids")],
+	"media_type" => [ _("Media class"), _("class of hardware device")],
+	"Model" => [_("Model"), _("hard disk model")],
 	"nbuttons" => [ _("Number of buttons"), "the number of buttons the mouse have"],
+	"name" => [ _("Name"), "the name of the cpu"],
+	"processor" => [ _("Processor ID"), _("the number of the processor")],
 	"Vendor" => [ _("Vendor"), _("the vendor name of the device")],
-	"alternative_drivers" => [ _("Alternative drivers"),
-						  _("the list of alternative drivers for this sound card")]
+	"vendor_id" => [ _("Vendor"), _("the vendor name of the processor")]
 	);
 
 
@@ -103,6 +106,7 @@ sub detect {
 	next if (!listlength(@devices)); # Skip empty class (no devices)
 	my $devices_list;
 	foreach (@devices) {
+	    $_->{custom_id} = harddrake::data::custom_id($_, $title);
 	    if (exists $_->{bus} && $_->{bus} eq "PCI") {
 		my $i = $_;
 		$_->{bus_id} = join ':', map { if_($i->{$_} ne "65535",  sprintf("%lx", $i->{$_})) } qw(vendor id subvendor subid);
@@ -239,7 +243,8 @@ sub new {
 	my $hw_class_tree = $tree->insert_node(undef, undef, @$arg, (gtkcreate_png($icon)) x 2, @$arg2);
 	# Fill the graphic tree with a "tree leaf" widget per device
 	foreach (@$devices_list) {
-		  my $custom_id = harddrake::data::custom_id($_, $title);
+	    my $custom_id = $_->{custom_id};
+		  delete $_->{custom_id};
 		  $custom_id .= ' ' while exists($tree->{data}{$custom_id});
 		  my $hw_item = $tree->insert_node($hw_class_tree, undef, [$custom_id ], 5, (undef) x 4, 1, 0);
 		  $tree->{data}{$custom_id} = $_;