remove info entry, remove old code

1 files changed, 2 insertions, 83 deletions

diff --git a/drakpxelinux.pl b/drakpxelinux.pl
index 2af94fb..9e73b35 100644
--- a/drakpxelinux.pl
+++ b/drakpxelinux.pl
@@ -463,6 +463,7 @@ sub edit_box_item {
 
     my $info = Gtk2::Entry->new;
     $info->set_text($entry->{info});
+    $info->set_sensitive(0);
     set_help_tip($info, 'info');
 
     # create file dialog widget, with file or directory selection
@@ -605,7 +606,7 @@ sub edit_box_item {
 	     0, gtkadd(Gtk2::Frame->new(N("PXE entry")),
 		       gtkpack_(gtkset_border_width(Gtk2::VBox->new, 5),
 				0, $label_and_widgets->(N("Label"), $label, ""),
-				0, $label_and_widgets->(N("Entry description"), $info, ""),
+				#0, $label_and_widgets->(N("Entry description"), $info, ""),
 				0, Gtk2::VSeparator->new,
 				0, $label_and_widgets->(N("Kernel image: ") . $network::pxe::pxelinux_client_root . "/", $kernel, $buttonkernel),
 				0, $label_and_widgets->(N("Initrd image: ") . $network::pxe::pxelinux_client_root . "/", $initrd, $buttoninitrd),
@@ -672,87 +673,6 @@ sub edit_box_item {
   }
 }
 
-# edit cell direct on main interface
-# disable due to bug in "cell edit placement" :-(
-sub cell_edited {
-  my ($cell, $path_string, $new_text, $model) = @_;
-  my $path = Gtk2::TreePath->new_from_string($path_string);
-  my $column = $cell->get_data("column");
-  my $iter = $model->get_iter($path);
-
-  my $i = ($path->get_indices)[0];
-  my $entry = $pxelinux_conf->{entries}[$i];
-
-  if ($column == COLUMN_LABEL) {
-    my $oldlabel = $entry->{label};
-
-    my $newlabel = $new_text;
-    if ($newlabel ne $oldlabel && test_similar_label($newlabel)) {
-      network::pxe::change_label_in_help($oldlabel, $newlabel);
-      $entry->{label} = $new_text;
-      $model->set($iter, $column, $entry->{label});
-    }
-  } elsif ($column == COLUMN_INFO) {
-    $entry->{info} = $new_text;
-    $model->set($iter, $column, $entry->{info});
-  } elsif ($column == COLUMN_KERNEL) {
-    if (-f $new_text) {
-      $entry->{kernel} = $new_text;
-      $model->set($iter, $column, $entry->{kernel});
-    }
-  } elsif ($column == COLUMN_INITRD) {
-    if (-f $new_text) {
-      $entry->{initrd} = $new_text;
-      $model->set($iter, $column, $entry->{initrd});
-    }
-  } elsif ($column == COLUMN_METHOD) {
-    if (!member($new_text, @list_method) || $entry->{kernel} =~ /memdisk/) {
-      return;
-    } else {
-      $entry->{method} = $new_text;
-      $model->set($iter, $column, $entry->{method});
-    }
-  } elsif ($column == COLUMN_INTERFACE) {
-    if (member($new_text, @list_eth) || $entry->{kernel} !~ /memdisk/) {
-      $entry->{interface} = $new_text;
-      $model->set($iter, $column, $entry->{interface});
-    }
-  } elsif ($column == COLUMN_NETWORK) {
-    if ($entry->{kernel} !~ /memdisk/) {
-      $entry->{network} = $new_text;
-      $model->set($iter, $column, $entry->{network});
-    }
-  } elsif ($column == COLUMN_SERVER) {
-    if ($entry->{kernel} !~ /memdisk/) {
-      $entry->{server} = $new_text;
-      $model->set($iter, $column, $entry->{server});
-    }
-  } elsif ($column == COLUMN_DIRECTORY) {
-    if (-d $new_text || $entry->{kernel} !~ /memdisk/) {
-      $entry->{directory} = $new_text;
-      $model->set($iter, $column, $entry->{directory});
-    }
-  } elsif ($column == COLUMN_RAMDISK) {
-    if (member($new_text, @list_ram) || $entry->{kernel} !~ /memdisk/) {
-      $entry->{ramdisk} = $new_text;
-      $model->set($iter, $column, $entry->{ramdisk});
-    }
-  } elsif ($column == COLUMN_VGA) {
-    if (exists $network::pxe::vga_resolution_to_bios{$new_text} || $entry->{kernel} !~ /memdisk/) {
-      $entry->{vga} = $network::pxe::vga_resolution_to_bios{$new_text};
-      $model->set($iter, $column, $entry->{vga});
-    }
-  } elsif ($column == COLUMN_DISPLAY) {
-    if ($entry->{kernel} !~ /memdisk/) {
-      $entry->{display} = $new_text;
-      $model->set($iter, $column, $entry->{display});
-    }
-  } elsif ($column == COLUMN_OPTION) {
-    $entry->{option} = $new_text;
-    $model->set($iter, $column, $entry->{option});
-  }
-}
-
 sub show_help() { info_dialog("help",
 			    gtkpack_(gtkset_border_width(Gtk2::VBox->new, 3),
 				     0, $help,
@@ -908,7 +828,6 @@ sub add_columns {
   each_index {
     my $renderer = Gtk2::CellRendererText->new;
     $renderer->set(editable => 0);
-    $renderer->signal_connect(edited => \&cell_edited, $model);
     $renderer->set_data(column => $::i);
     $treeview->insert_column_with_attributes(-1, $_, $renderer, 'text' => $::i);
   } N("Label"), N("Entry description"), N("Kernel image"), N("Initrd image"), N("Installation method"), N("Network interface"), N("DHCP or IP address"), N("Remote server name"), N("Remote installation directory"), N("Ramdisk size"), N("Frame buffer resolution"), N("Remote IP of X server"), N("Custom options");