no_comment

4 files changed, 36 insertions, 32 deletions

diff --git a/docs/TODO b/docs/TODO
index 29d75e839..1b0159dbb 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -28,18 +28,12 @@ RAID upgrades
 
 (7.1) improve printerdrake to at least same functionalities of printtool.
 
-(7.2 or later)horizontal sub-steps
-
 (7.1)better help for partitioning in newbie, keyboard shortcut.
 
-(???)free provider auto configuration facility (to be discussed).
-
 (7.1 or later?)help in some configuration files.
 
 (7.1)progression bar on crypto.
 
-(7.1)manage a lot of language (ergonomic issue as it already exists)
-
 (?)firewall configuration (instant firewalling?)
 
 (7.1)syslinux in graphical mode to be improved for heavily bogus BIOSes.
@@ -47,23 +41,15 @@ RAID upgrades
 (7.1)install in 800x600
 - need handling of both 640x480 (mostly for VGA16) and 800x600
 
-(?)tree for choosing things like timezone, monitors, graphic cards, modules, mice, keyboard? ...
-
 (7.1)index/compress hdlist? (for multi-cd)
 ! for multi-cd live is mandatory, small transaction are mandatory too.
 
-(7.1 or later)widget for displaying fdisk (dindinx)
-
-(?)on laptop, configure the MMU to use swap not very often
-
 (7.1, other persons)rescue: 
 - small modification for stage1 to get the rescue stage2
 - create a stage2 with many tools (fdisk, bash...)
 the rescue could be on another cd (if multi-cd)
 ! care must be taken about modules (if ide is in module...)
 
-(?)checkboxes in groups based on compssList (and availableSpace?)
-
 (7.1)Improved network configuration (PPP and/or Ethernet)
 PPPoE install and configuration (SuSE includes it, DHCP-like)
 
@@ -75,12 +61,6 @@ PPPoE install and configuration (SuSE includes it, DHCP-like)
 crypto: add a cancel & progress bar while downloading
 error handling (like reading hdlist)
 
-(7.2 or later)diskdrake in text mode
-
-(see above)add fdisk using the zvt widget (taken in gnome-libs)
-
-(?)see what can be done with nvram (50 bytes to save information)
-
 (7.1)Generally improved package selection /ergonmic issue.
 Tree -> CTree, ``all'' branch with all packages
 show the value associated (100->a must, 90->great, 80->nice, ... 10->useless, 0->do not install)
@@ -92,6 +72,18 @@ show the value associated (100->a must, 90->great, 80->nice, ... 10->useless, 0-
 (?)enable the testing of the mouse type (under X) (wheel)
 possibility to specify the mouse
 
+(7.2 or later)horizontal sub-steps
+
+(7.2 or later)diskdrake in text mode
+
+(7.1 or later)widget for displaying fdisk (dindinx)
+(see above)add fdisk using the zvt widget (taken in gnome-libs)
+
+
+(done,pix,7.1)manage a lot of language (ergonomic issue as it already exists)
+
+(done,pix,7.1)tree for choosing things like timezone, monitors, graphic cards, modules, mice, keyboard? ...
+
 ----
 paride in stage1
 
@@ -160,6 +152,14 @@ bug keyboard focus: after switch in console at Xconfig step
 
 
 -to look at--------------------------------------------------------------------------
+(???)free provider auto configuration facility (to be discussed).
+
+(?)on laptop, configure the MMU to use swap not very often
+
+(?)checkboxes in groups based on compssList (and availableSpace?)
+
+(?)see what can be done with nvram (50 bytes to save information)
+
 support wacom
 
 bug in diskdrake: can in strange cases create a primary partition at sector #0
@@ -456,4 +456,3 @@ peut en sortir. La seule solution est de redémarrer.
 (done,pix)urpmi: handle many args on cmd-line
 
 (done,pix)fix any // in path to ftp server otherwise windobe server bug :(
-
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 2257b1785..8b2089120 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -33,7 +33,7 @@ sub readCardsDB {
     my ($file) = @_;
     my ($card);
 
-    %cards and return;
+#    %cards and return;
 
     local *F;
     open F, $file or die "file $file not found";
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 8d45913fe..6b9d89fb9 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -78,8 +78,12 @@ sub ask_from_treelistW {
 	if ($def eq $_) {
 	    $wdef = $node;
 	    my $s; $tree->expand($wtree{$s .= "$_$separator"}) foreach split $sep, $root;
-	    foreach (1 .. @$l) {
-		$tree->node_nth($_) == $node and $ndef = $_, last;
+	    foreach my $nb (1 .. @$l) {
+		if ($tree->node_nth($nb) == $node) {
+		    $tree->focus_row($nb);
+		    Gtk->idle_add(sub { $tree->moveto($nb, 0, 0.5, 0); 0 });
+		    last;
+		}
 	    }
 	}
     }
@@ -98,9 +102,11 @@ sub ask_from_treelistW {
     $w->{ok_clicked} = $leave;
     $w->{cancel_clicked} = sub { $o->destroy; die "ask_from_list cancel" }; #- make sure windows doesn't live any more.
     gtkadd($w->{window},
-	   gtkpack_(new Gtk::VBox(0,0),
-		    1, gtkset_usize(createScrolledWindow($tree), 400, 350),
-		    0, $w->create_okcancel));
+	   gtkpack($w->create_box_with_title(@$messages),
+		   gtkpack_(new Gtk::VBox(0,7),
+			    1, gtkset_usize(createScrolledWindow($tree), 300, 350),
+			    0, $w->create_okcancel)));
+    $tree->set_column_auto_resize(0, 1);
     $tree->set_selection_mode('browse');
     $tree->signal_connect(tree_select_row => sub { $curr = $_[1]; });
     $tree->signal_connect(button_press_event => sub { &$leave if $_[1]{type} =~ /^2/ });
@@ -114,10 +120,9 @@ sub ask_from_treelistW {
 	1;
     });
 
-    $tree->focus_row($ndef) if $ndef;
-    $tree->select($wdef) if $wdef;
-    $tree->node_moveto($wdef, 0, 0.5, 0) if $wdef;
-
+    if ($wdef) {
+	$tree->select($wdef);
+    }
     $tree->grab_focus;
 
     $w->main or die "ask_from_list cancel";
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 4ec8ef611..6ebfbca0a 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-use lib qw(.); #/usr/lib/libDrakX);
+use lib qw(/usr/lib/libDrakX);
 
 use interactive;
 use Xconfigurator;