summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-02-15 13:16:33 +0000
committerdamien <damien@mandriva.com>2001-02-15 13:16:33 +0000
commitd12097f79cc1e6f6714b0f3dba612a2dc57de0a8 (patch)
tree1f8079575cc7c4f04109fe02049f0c1e552981ea /perl-install/any.pm
parent047975970256916fc31f75b52a2a707976a0baa4 (diff)
downloaddrakx-backup-do-not-use-d12097f79cc1e6f6714b0f3dba612a2dc57de0a8.tar
drakx-backup-do-not-use-d12097f79cc1e6f6714b0f3dba612a2dc57de0a8.tar.gz
drakx-backup-do-not-use-d12097f79cc1e6f6714b0f3dba612a2dc57de0a8.tar.bz2
drakx-backup-do-not-use-d12097f79cc1e6f6714b0f3dba612a2dc57de0a8.tar.xz
drakx-backup-do-not-use-d12097f79cc1e6f6714b0f3dba612a2dc57de0a8.zip
added png support. Need to test the faces2xpm stuff.
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 2b2f2b4b8..2b65ca7c4 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -28,11 +28,15 @@ sub face2xpm {
my ($face, $prefix) = @_;
facesdir($prefix) . $face . ".xpm";
}
+sub face2png {
+ my ($face, $prefix) = @_;
+ facesdir($prefix) . $face . ".png";
+}
sub facesnames {
my ($prefix) = @_;
my $dir = facesdir($prefix);
my @l = grep { /^[A-Z]/ } all($dir);
- grep { -e "$dir/$_.png" } map { /(.*)\.xpm/ } @l ? @l : all($dir);
+ grep { -e "$dir/$_.png" } map { /(.*)\.xpm/ } (@l ? @l : all($dir));
}
sub addKdmIcon {
@@ -675,7 +679,7 @@ sub ask_users {
{ label => _("Password (again)"), val => \$u->{password2}, hidden => 1 },
{ label => _("Shell"), val => \$u->{shell}, list => [ shells($prefix) ], not_edit => !$::expert, advanced => 1 },
if_($security <= 3,
- { label => _("Icon"), val => \$u->{icon}, list => [ facesnames($prefix) ], icon2f => sub { face2xpm($_[0], $prefix) }, format => \&translate },
+ { label => _("Icon"), val => \$u->{icon}, list => [ facesnames($prefix) ], icon2f => sub { face2png($_[0], $prefix) }, format => \&translate },
),
],
) or return;