- splash screen for userdrake launching

1 files changed, 15 insertions, 12 deletions

diff --git a/userdrake b/userdrake
index 6184220..5aac5a5 100755
--- a/userdrake
+++ b/userdrake
@@ -42,8 +42,11 @@ my $pixdir = '/usr/share/userdrake/pixmaps/';
 
 my $in = interactive->vnew('su');
 
+my $wait = $in->wait_message(N("Please wait"), N("Loading User and Groups"));
+gtkflush();
+
 my $us = {} ;
-$us->{VERSION} = 0.92;
+$us->{VERSION} = '0.92';
 my $error = 0;
 my $GetValue = -65533;
 my $stringsearch = '';
@@ -54,9 +57,9 @@ my $sysfilter = text2bool($prefs{FILTER});
 sub HelpSystem { system("drakhelp Drakxtools-Guide.html/userdrake.html &") };
 
 $us->{wnd} = ugtk2->new(N("Mandrake Linux Users Management Tool") . " " . $us->{VERSION});
-gtkset_size_request($us->{wnd}{window}, 660, 460);
+gtkset_size_request($us->{wnd}{rwindow}, 660, 460);
 $us->{wnd}{rwindow}->set_position('center');
-$us->{wnd}{rwindow}->signal_connect(delete_event => \&QuitGlobal);
+$us->{wnd}{window}->signal_connect(delete_event => \&QuitGlobal);
 my $utree_model = Gtk2::ListStore->new("Glib::String", "Glib::Int", "Glib::String", "Glib::String", "Glib::String", "Glib::String", "Glib::String" );
 my $gtree_model = Gtk2::ListStore->new("Glib::String", "Glib::Int", "Glib::String" );
 my ($usertree, $grouptree);
@@ -111,13 +114,12 @@ gtkappend_page(my $nb = Gtk2::Notebook->new, gtkpack(create_scrolled_window($use
 #PO: list of users belonging to that group
 gtkappend_page($nb, gtkpack(create_scrolled_window($grouptree)), gtkshow(Gtk2::Label->new(N("Groups"))));
 $nb->set_show_border(0);
-gtkadd($us->{wnd}{window},
-       gtkpack_(Gtk2::VBox->new(0, 0),
-		0, $menu,
-		0, $toolb,
-		0, $searchBox,
-          0, Gtk2::HSeparator->new,
-		1, $nb ));
+$us->{wnd}{window}->add( gtkpack_(Gtk2::VBox->new(0, 0),
+				  0, $menu,
+				  0, $toolb,
+				  0, $searchBox,
+				  0, Gtk2::HSeparator->new,
+				  1, $nb ));
 my @ucolsize = (60, 45, 40, 120, 80, 120, 50, -1); my @gcolsize =(100, 80, 160, -1) ;
 each_index {
     my $col = Gtk2::TreeViewColumn->new_with_attributes($_, Gtk2::CellRendererText->new, 'text' => $::i);
@@ -150,6 +152,8 @@ $fbut->signal_connect('clicked', sub { $stringsearch = $filter->get_text() ; Ref
 Refresh($sysfilter, $stringsearch);
 $nb->signal_connect('switch-page' => sub { NotebookSwitch() });
 $us->{wnd}{rwindow}->show_all;
+undef $wait;
+gtkset_mousecursor_normal();
 Gtk2->main;
 ugtk2->exit;
 
@@ -921,8 +925,7 @@ sub About {
     gtkpack_($window_about->vbox,
              -r "$pixdir/userdrake.png" ?
              (0, Gtk2::Image->new_from_file("$pixdir/userdrake.png")) : (1, gtkmodify_font(Gtk2::Label->new(N("Users Management \n") . $us->{VERSION}), 'Bold 18'),),
-             0, Gtk2::Label->new("\n" . N("Copyright (C) 2003 Mandrakesoft SA") . "\n"),
-             1, $list,
+	     1, $list,
 	    );
     $window_about->show_all;
 }