Merge branch 'master' of ssh://git.mageia.org/software/adminpanel

3 files changed, 10 insertions, 39 deletions

diff --git a/modules/services/adminService b/modules/services/adminService
index d4f8fe39..953b2ccd 100755
--- a/modules/services/adminService
+++ b/modules/services/adminService
@@ -3,21 +3,11 @@
 use strict;
 use lib qw(/usr/lib/libDrakX);
 
-use standalone;     #- warning, standalone must be loaded very first, for 'explanations'
-
-use common;
-use AdminPanel::Shared;
+use common qw(N);
 use AdminPanel::Services::AdminService;
-use log;
-
-use yui;
-
-my $wm_icon = "/usr/share/mcc/themes/default/service-mdk.png";
-
-yui::YUI::app()->setApplicationTitle(N("Services and daemons"));
-yui::YUI::app()->setApplicationIcon($wm_icon);
 
-my $serviceMan = AdminPanel::Services::AdminService->new();
+my $serviceMan = AdminPanel::Services::AdminService->new({icon => "/usr/share/mcc/themes/default/service-mdk.png",
+                                                          name => N("Services and daemons"),});
 $serviceMan->start();
 
 1;
diff --git a/modules/usermanager/adminUser b/modules/usermanager/adminUser
index e4cbe5fd..c7f5b23a 100755
--- a/modules/usermanager/adminUser
+++ b/modules/usermanager/adminUser
@@ -2,22 +2,12 @@
 
 use lib qw(/usr/lib/libDrakX);
 
-use standalone;     #- warning, standalone must be loaded very first, for 'explanations'
+use common qw(N);
 
-use common;
-use security::level;
-
-use AdminPanel::Shared;
 use AdminPanel::Users::GUsers;
 
-use yui;
-
-my $wm_icon = "/usr/share/icons/userdrake.png"; 
-
-yui::YUI::app()->setApplicationTitle(N("Mageia Users Management Tool"));
-yui::YUI::app()->setApplicationIcon($wm_icon);
-
-my $userMan = AdminPanel::Users::GUsers->new();
+my $userMan = AdminPanel::Users::GUsers->new({icon => "/usr/share/icons/userdrake.png",
+                                              name => N("Mageia Users Management Tool"),});
 $userMan->start();
 
 1;
diff --git a/modules/usermanager/mgaAddUser b/modules/usermanager/mgaAddUser
index d9d2297c..f1af4bd3 100755
--- a/modules/usermanager/mgaAddUser
+++ b/modules/usermanager/mgaAddUser
@@ -2,21 +2,12 @@
 
 use lib qw(/usr/lib/libDrakX);
 
-use standalone;     #- warning, standalone must be loaded very first, for 'explanations'
+use common qw(N);
 
-use common;
-
-use AdminPanel::Shared;
 use AdminPanel::Users::GUsers;
 
-use yui;
-
-my $wm_icon = "/usr/share/icons/userdrake.png"; 
-
-yui::YUI::app()->setApplicationTitle(N("Mageia Add Users Tool"));
-yui::YUI::app()->setApplicationIcon($wm_icon);
-
-my $userMan = AdminPanel::Users::GUsers->new();
-$userMan->addUserDialog();
+my $userMan = AdminPanel::Users::GUsers->new({icon => "/usr/share/icons/userdrake.png",
+                                              name => N("Mageia Add Users Tool"),});
+$userMan->addUserDialog(1);
 
 1;