From a6aca8eb80e3d96315113e0d51c947534e5ed365 Mon Sep 17 00:00:00 2001 From: Daouda Lo Date: Thu, 26 Feb 2004 10:03:40 +0000 Subject: - change bootsplash --- userdrake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/userdrake b/userdrake index ea6cada..1dd1a20 100755 --- a/userdrake +++ b/userdrake @@ -53,7 +53,7 @@ $window_splash->set_title(N("Userdrake") . $us->{VERSION}); $window_splash->set_position('center_always'); $window_splash->add(gtkadd(gtkset_shadow_type(Gtk2::Frame->new, 'etched_out'), gtkpack(Gtk2::VBox->new(0, 0), - gtkcreate_img("$pixdir/about.png"), + gtkcreate_img("$pixdir/userdrake.png"), Gtk2::Label->new(N("Loading Users and Groups... Please wait")) ) ) @@ -276,6 +276,7 @@ sub AddUser { gtksignal_connect(Gtk2::Button->new_from_stock($_->[0]), clicked => sub { if (!$r) { $u{username} = $us->{o}{login}->get_text; $error = 0; + $u{gecos} = $us->{o}{fullname}->get_text; if (!valid($u{username})) { RaiseError($us->{error}) }; !$error and my $nm = $ctx->LookupUserByName($u{username}); if ($nm) { RaiseError(N("User already exists, please choose another User Name")); $us->{o}{login}->set_text('') }; @@ -323,7 +324,7 @@ sub AddUser { } if (!$error) { log::explanations(N("Adding user : %s", $u{username})); - $u{gecos} = $us->{o}{fullname}->get_text; $u{loginshell} = $us->{o}{shells}->entry->get_text; + $u{loginshell} = $us->{o}{shells}->entry->get_text; $userEnt->Gecos($u{gecos}); $userEnt->LoginShell($u{loginshell}); $userEnt->Gid($u{gid}); $userEnt->ShadowMin(-1); $userEnt->ShadowMax(99999); $userEnt->ShadowWarn(-1); $userEnt->ShadowInact(-1); @@ -375,7 +376,7 @@ sub ChooseGroup() { gtksignal_connect(Gtk2::Button->new_from_stock('gtk-cancel'), clicked => sub { $error = 1; $w->destroy })))); $w->show_all; $choice; -} +} sub GimmeChoice { my ($title, $text) = @_; my $w = NewWindow(N("Choice"), 1); @@ -955,7 +956,7 @@ sub About { $list->can_focus(0); each_index { $list->append_column(Gtk2::TreeViewColumn->new_with_attributes(undef, Gtk2::CellRendererText->new, 'text' => $::i)) } 0..2; $list->set_headers_visible(0); - foreach my $row ([ N("Authors: "), '', '' ], [ '', 'Daouda Lo', '' ], ['', '', '']) { + foreach my $row (['Copyright', '2003,2004', 'MandrakeSoft SA'], [ N("Authors: "), '', '' ], [ '', 'Daouda Lo', '' ], ['', '', '']) { $tree_model->append_set(undef, [ map_index { $::i => $_ } @$row ]); } $list->get_selection->set_mode('none'); @@ -971,6 +972,10 @@ sub valid { $_[0] =~ /^[a-z]+?[a-z0-9_-]*?$/ or $us->{error} = N("The name must contain only lower cased latin letters, numbers, `-' and `_'"), return 0; length($_[0]) <= 32 or $us->{error} = N("Name is too long"), return 0; return 1; +} +# UTF8 mess work around +sub validGecos { + } sub RaiseError { my $w = NewWindow(N("Error"), 1); -- cgit v1.2.1