*** empty log message ***

1 files changed, 18 insertions, 6 deletions

diff --git a/userdrake2 b/userdrake2
index 7c886ff..3859758 100755
--- a/userdrake2
+++ b/userdrake2
@@ -36,9 +36,6 @@ my $us = {} ;#my $us = USER::ADMIN->new;
 $us->{VERSION} = 0.91;
 my $pixdir = '/usr/share/userdrake/pixmaps/';
 
-my $h = USER::ADMIN->new;
-$h->start();
-
 my $in = interactive->vnew('su', 'default');
 
 sub HelpSystem { system("drakhelp Drakxtools-Guide.html/userdrake.html &") };
@@ -46,8 +43,8 @@ sub DisplayAllUsers { }
 
 $us->{wnd} = ugtk2->new(N("Mandrake Linux Users Management Tool") . " " . $us->{VERSION}, center => 1);
 gtkset_size_request($us->{wnd}{window}, 580, 440);
-my $utree_model = Gtk2::ListStore->new(Gtk2::GType->STRING, Gtk2::GType->INT, Gtk2::GType->STRING, Gtk2::GType->STRING, Gtk2::GType->STRING, Gtk2::GType->STRING);
-my $gtree_model = Gtk2::ListStore->new(Gtk2::GType->STRING, Gtk2::GType->INT, Gtk2::GType->STRING);
+my $utree_model = Gtk2::ListStore->new(Gtk2::GType->STRING, Gtk2::GType->INT, Gtk2::GType->STRING, Gtk2::GType->STRING, Gtk2::GType->STRING, Gtk2::GType->STRING, Gtk2::GType->OBJECT);
+my $gtree_model = Gtk2::ListStore->new(Gtk2::GType->STRING, Gtk2::GType->INT, Gtk2::GType->STRING, Gtk2::GType->OBJECT);
 my ($usertree, $grouptree);
 $usertree = CreateTree($utree_model); $grouptree = CreateTree($gtree_model);
 
@@ -73,6 +70,9 @@ my ($menu, $factory) = create_factory_menu($us->{wnd}{rwindow},
 					  );
 $checkall = $factory->get_widget("<main>" . N("/Options") . N("/All Users"));
 my $toolb = Gtk2::Toolbar->new;
+my $searchBox = Gtk2::HBox->new(0,5);
+$searchBox->pack_end(my $fbut = Gtk2::Button->new("Apply filter"), 0, 0, 4);
+$searchBox->pack_end(my $filter = Gtk2::Entry->new, 0, 0, 4);
 gtkappend_page(my $nb = Gtk2::Notebook->new, gtkpack(create_scrolled_window($usertree)), gtkshow(Gtk2::Label->new(N("Users"))));
 gtkappend_page($nb, gtkpack(create_scrolled_window($grouptree)), gtkshow(Gtk2::Label->new(N("Group Users"))));
 $nb->set_show_border(0);
@@ -80,6 +80,7 @@ gtkadd($us->{wnd}{window},
        gtkpack_(Gtk2::VBox->new(0, 0),
 		0, $menu,
 		0, $toolb,
+		0, $searchBox,
 		1, $nb ));
 my @ucolsize = (80, 60, 60, 120, 80, 80, -1); my @gcolsize =(100, 80, 160, -1) ;
 each_index {
@@ -103,11 +104,22 @@ map {
     [ N("Refresh"), N("Refresh the list"), 'refresh', \&Refresh ],
     [ N("Help"), N("Generic help on userdrake"), 'help', \&HelpSystem ]
   );
-   
+
+my $h = USER::ADMIN->new;
+$h->start();
+#my $u = $h->users_enumerate_full();
+#my $g = $h->groups_enumerate_full("");
+my $ent = USER::ENT->new; 
+
 $us->{wnd}{rwindow}->show_all;
 Gtk2->main;
 ugtk2->exit;
 
+sub get_groups_list {
+    my $pattern = shift ;
+    my $g = $h->users_enumerate_full
+}
+
 sub AddUser {
     my $w = ugtk2->new(N("Create New User"), grab => 1);
     my $mode = 0;