summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/TODO5
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/common.pm23
-rw-r--r--perl-install/share/themes-savane.rc2
4 files changed, 18 insertions, 14 deletions
diff --git a/docs/TODO b/docs/TODO
index ffdd0a3eb..39f4fbf34 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,5 +1,3 @@
-replace in place catchable die's by cdie's (as in partition_table::load)
-
add the different xmodmaps for every languages (maybe gnome-core xmodmaps can help)
xmodmap needed even for english as the backspace is not what it should
@@ -16,7 +14,6 @@ add the ability to give arguments to insmod.
remove the hack in pkgs.pm (search for hack)
-`Show all' should toggle in package selection
help:programs is empty in expert in package selection
pb with ghostscript-both & ghostscript-X11...
@@ -25,6 +22,8 @@ pb with dependencies ``missing'': icewm do not require XFree86 and so you can ha
/etc/sysconfig/mouse is not created
+replace in place catchable die's by cdie's (as in partition_table::load)
+
Xconfigurator:
simplify Monitors
possibility to show card autodetected
diff --git a/perl-install/Makefile b/perl-install/Makefile
index f3ade7db5..2d4ca11f8 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -31,7 +31,7 @@ tar: clean
floppy:
dd if=/dev/zero of=/tmp/initrd bs=1k count=2000 ; echo y | mke2fs /tmp/initrd ; mount /tmp/initrd /mnt/disk/ -o loop ; cp -a ../install1/* /mnt/disk/ ; umount /mnt/disk ; gzip -c /tmp/initrd > /tmp/initrd.img ; mcopy -o /tmp/initrd.img a:
-tar-diskdrake: clean
+tar-diskdrake: clean pci_probing
cd .. ; rm -rf diskdrake ; cp -af perl-install diskdrake
l=`./perl2fcalls -uses -excludec diskdrake | sort | uniq | sed -e 's/::/\//' -e 's/^/diskdrake\//' -e 's/$$/.pm/'` ; \
diff --git a/perl-install/common.pm b/perl-install/common.pm
index ca6d9840d..78533befc 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -173,18 +173,23 @@ sub untranslate($@) {
}
sub warp_text($;$) {
- my ($text, $width) = shift;
+ my ($text, $width) = @_;
$width ||= 80;
-
- my ($t, @l); foreach (split /\s+/, $text) {
- if (length "$t $_" > $width) {
- push @l, $t;
- $t = $_;
- } else {
- $t = "$t $_";
+
+ my @l;
+ foreach (split "\n", $text) {
+ my $t;
+ foreach (split /\s+/, $_) {
+ if (length "$t $_" > $width) {
+ push @l, $t;
+ $t = $_;
+ } else {
+ $t = "$t $_";
+ }
}
+ push @l, $t;
}
- @l, $t;
+ @l;
}
sub getVarsFromSh($) {
diff --git a/perl-install/share/themes-savane.rc b/perl-install/share/themes-savane.rc
index 38ecc11d5..74f6391f2 100644
--- a/perl-install/share/themes-savane.rc
+++ b/perl-install/share/themes-savane.rc
@@ -29,7 +29,7 @@ style "button"
style "background"
{
- bg[NORMAL] = { 0, 0.67, 0 }
+ bg[NORMAL] = { 0.67, 0.33, 1.0 }
}
widget_class "*" style "any"