From fc9772f1f03684e8dab50ff77d2c46c5e0309c7b Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Mon, 16 Mar 2015 18:16:50 +0100 Subject: Moved to namespace to ManaTools --- scripts/mana | 5 ++++- scripts/manaadduser | 17 +++++++++-------- scripts/manaclock | 21 +++++++++++++++++++-- scripts/manadm | 14 ++++++++------ scripts/manahost | 16 +++++++++------- scripts/manalog | 13 +++++++------ scripts/manaproxy | 16 +++++++++------- scripts/manaservice | 17 +++++++++-------- scripts/manauser | 25 +++++++++++++++++++++---- scripts/manawall | 16 +++++++++------- scripts/mpan | 20 ++++++++++---------- 11 files changed, 114 insertions(+), 66 deletions(-) (limited to 'scripts') diff --git a/scripts/mana b/scripts/mana index c436fc7..234be23 100755 --- a/scripts/mana +++ b/scripts/mana @@ -4,6 +4,9 @@ # # Copyright (c) 2014 - 2015 Angelo naselli # +# This file is part of manatools +# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2, as # published by the Free Software Foundation. @@ -19,7 +22,7 @@ # #***************************************************************************** -use AdminPanel::Privileges; +use ManaTools::Privileges; use yui; diff --git a/scripts/manaadduser b/scripts/manaadduser index f2b3c32..d0309b5 100755 --- a/scripts/manaadduser +++ b/scripts/manaadduser @@ -1,26 +1,27 @@ #!/usr/bin/perl +# vim: set et ts=4 sw=4: # Copyright 2014 - 2015 Angelo Naselli # -# This file is part of proxymanager thus adminpanel +# This file is part of manatools # -# proxymanager is free software: you can redistribute it and/or modify +# manatools is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# proxymanager is distributed in the hope that it will be useful, +# manatools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with AdminPanel. If not, see . -use AdminPanel::Module::Users; -use AdminPanel::Shared::Locales; +# along with ManaTools. If not, see . +use ManaTools::Module::Users; +use ManaTools::Shared::Locales; -my $loc = AdminPanel::Shared::Locales->new(domain_name => 'userdrake'); +my $loc = ManaTools::Shared::Locales->new(domain_name => 'userdrake'); -my $userMan = AdminPanel::Module::Users->new({icon => "/usr/share/icons/userdrake.png", +my $userMan = ManaTools::Module::Users->new({icon => "/usr/share/icons/userdrake.png", name => $loc->N("Mageia Add Users Tool"),}); $userMan->addUserDialog(1); diff --git a/scripts/manaclock b/scripts/manaclock index 37aadb6..19d30c5 100755 --- a/scripts/manaclock +++ b/scripts/manaclock @@ -1,8 +1,25 @@ #!/usr/bin/perl +# vim: set et ts=4 sw=4: +# Copyright 2014 - 2015 Angelo Naselli +# +# This file is part of manatools +# +# manaclock is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# manaclock is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ManaTools. If not, see . -use AdminPanel::Module::Clock; +use ManaTools::Module::Clock; -my $clockManager = AdminPanel::Module::Clock->new(); +my $clockManager = ManaTools::Module::Clock->new(); $clockManager->start(); diff --git a/scripts/manadm b/scripts/manadm index 1848c27..e78915d 100755 --- a/scripts/manadm +++ b/scripts/manadm @@ -1,23 +1,25 @@ #!/usr/bin/perl +# vim: set et ts=4 sw=4: # Copyright 2013 - 2015 Matteo Pasotti +# 2015 Angelo Naselli # -# This file is part of hostmanager thus adminpanel +# This file is part of manatools # -# hostmanager is free software: you can redistribute it and/or modify +# manadm is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# hostmanager is distributed in the hope that it will be useful, +# manadm is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with AdminPanel. If not, see . +# along with ManaTools. If not, see . use Modern::Perl '2011'; use autodie; -use AdminPanel::Module::DisplayManager; +use ManaTools::Module::DisplayManager; use yui; @@ -27,7 +29,7 @@ my $wm_name = "Display Manager"; yui::YUI::app()->setApplicationTitle($wm_name); yui::YUI::app()->setApplicationIcon($wm_icon); -my $dmanager = AdminPanel::Module::DisplayManager->new({ +my $dmanager = ManaTools::Module::DisplayManager->new({ icon => $wm_icon, name => $wm_name }); diff --git a/scripts/manahost b/scripts/manahost index fcfa3c2..b773f1f 100755 --- a/scripts/manahost +++ b/scripts/manahost @@ -1,33 +1,35 @@ #!/usr/bin/perl +# vim: set et ts=4 sw=4: # Copyright 2013 - 2015 Matteo Pasotti +# 2015 Angelo Naselli # -# This file is part of hostmanager thus adminpanel +# This file is part of manatools # -# hostmanager is free software: you can redistribute it and/or modify +# manahost is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# hostmanager is distributed in the hope that it will be useful, +# manahost is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with AdminPanel. If not, see . +# along with ManaTools. If not, see . use Modern::Perl '2011'; use autodie; -use AdminPanel::Module::Hosts; +use ManaTools::Module::Hosts; use yui; -my $wm_icon = "/usr/lib/libDrakX/icons/IC-Dhost-48.png"; +my $wm_icon = "/usr/lib/libDrakX/icons/IC-Dhost-48.png"; my $wm_name = "Manage hosts definitions"; yui::YUI::app()->setApplicationTitle($wm_name); yui::YUI::app()->setApplicationIcon($wm_icon); -my $hostMan = AdminPanel::Module::Hosts->new({ +my $hostMan = ManaTools::Module::Hosts->new({ icon => $wm_icon, name => $wm_name }); diff --git a/scripts/manalog b/scripts/manalog index 4d1644c..9ed07ef 100755 --- a/scripts/manalog +++ b/scripts/manalog @@ -1,25 +1,26 @@ #!/usr/bin/perl +# vim: set et ts=4 sw=4: # Copyright 2014 - 2015 Angelo Naselli # -# This file is part of proxymanager thus adminpanel +# This file is part of manatools # -# proxymanager is free software: you can redistribute it and/or modify +# manalog is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# proxymanager is distributed in the hope that it will be useful, +# manalog is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with AdminPanel. If not, see . +# along with ManaTools. If not, see . use strict; -use AdminPanel::Module::LogViewer; +use ManaTools::Module::LogViewer; -my $logviewer = AdminPanel::Module::LogViewer->new({icon => "/usr/share/mcc/themes/default/logdrake-mdk.png", +my $logviewer = ManaTools::Module::LogViewer->new({icon => "/usr/share/mcc/themes/default/logdrake-mdk.png", }); $logviewer->start(); diff --git a/scripts/manaproxy b/scripts/manaproxy index dee06c1..61c99d5 100755 --- a/scripts/manaproxy +++ b/scripts/manaproxy @@ -1,33 +1,35 @@ #!/usr/bin/perl +# vim: set et ts=4 sw=4: # Copyright 2013 - 2015 Matteo Pasotti +# 2015 Angelo Naselli # -# This file is part of proxymanager thus adminpanel +# This file is part of manatools # -# proxymanager is free software: you can redistribute it and/or modify +# manaproxy is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# proxymanager is distributed in the hope that it will be useful, +# manaproxy is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with AdminPanel. If not, see . +# along with ManaTools. If not, see . use Modern::Perl '2011'; use autodie; -use AdminPanel::Module::Proxy; +use ManaTools::Module::Proxy; use yui; -my $wm_icon = "/usr/share/mcc/themes/default/drakproxy-mdk.png"; +my $wm_icon = "/usr/share/mcc/themes/default/drakproxy-mdk.png"; my $wm_name = "Proxies configuration"; yui::YUI::app()->setApplicationTitle($wm_name); yui::YUI::app()->setApplicationIcon($wm_icon); -my $proxyMan = AdminPanel::Module::Proxy->new({ +my $proxyMan = ManaTools::Module::Proxy->new({ icon => $wm_icon, name => $wm_name }); diff --git a/scripts/manaservice b/scripts/manaservice index 59fff4d..a42593b 100755 --- a/scripts/manaservice +++ b/scripts/manaservice @@ -1,28 +1,29 @@ #!/usr/bin/perl +# vim: set et ts=4 sw=4: # Copyright 2014 - 2015 Angelo Naselli # -# This file is part of proxymanager thus adminpanel +# This file is part of manatools # -# proxymanager is free software: you can redistribute it and/or modify +# manaservice is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# proxymanager is distributed in the hope that it will be useful, +# manaservice is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with AdminPanel. If not, see . +# along with ManaTools. If not, see . use strict; -use AdminPanel::Module::Services; -use AdminPanel::Shared::Locales; +use ManaTools::Module::Services; +use ManaTools::Shared::Locales; -my $loc = AdminPanel::Shared::Locales->new(domain_name => 'libDrakX-standalone'); +my $loc = ManaTools::Shared::Locales->new(domain_name => 'libDrakX-standalone'); -my $serviceMan = AdminPanel::Module::Services->new({icon => "/usr/share/mcc/themes/default/service-mdk.png", +my $serviceMan = ManaTools::Module::Services->new({icon => "/usr/share/mcc/themes/default/service-mdk.png", name => $loc->N("Services and daemons"),}); $serviceMan->start(); diff --git a/scripts/manauser b/scripts/manauser index 363af4f..08ed91a 100755 --- a/scripts/manauser +++ b/scripts/manauser @@ -1,11 +1,28 @@ #!/usr/bin/perl +# vim: set et ts=4 sw=4: +# Copyright 2014 - 2015 Angelo Naselli +# +# This file is part of manatools +# +# manauser is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. +# +# manauser is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ManaTools. If not, see . -use AdminPanel::Module::Users; -use AdminPanel::Shared::Locales; +use ManaTools::Module::Users; +use ManaTools::Shared::Locales; -my $loc = AdminPanel::Shared::Locales->new(domain_name => 'userdrake'); +my $loc = ManaTools::Shared::Locales->new(domain_name => 'userdrake'); -my $userMan = AdminPanel::Module::Users->new({icon => "/usr/share/icons/userdrake.png", +my $userMan = ManaTools::Module::Users->new({icon => "/usr/share/icons/userdrake.png", name => $loc->N("Mageia Users Management Tool"),}); $userMan->start(); diff --git a/scripts/manawall b/scripts/manawall index c263b63..ee0f727 100755 --- a/scripts/manawall +++ b/scripts/manawall @@ -1,33 +1,35 @@ #!/usr/bin/perl +# vim: set et ts=4 sw=4: # Copyright 2013 - 2015 Matteo Pasotti +# 2015 Angelo Naselli # -# This file is part of hostmanager thus adminpanel +# This file is part manatools # -# hostmanager is free software: you can redistribute it and/or modify +# manawall is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# hostmanager is distributed in the hope that it will be useful, +# manawall is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with AdminPanel. If not, see . +# along with ManaTools. If not, see . use Modern::Perl '2011'; use autodie; -use AdminPanel::Module::Firewall; +use ManaTools::Module::Firewall; use yui; -my $wm_icon = "/usr/share/mcc/themes/default/firewall-mdk.png"; +my $wm_icon = "/usr/share/mcc/themes/default/firewall-mdk.png"; my $wm_name = "Manage firewall rules"; yui::YUI::app()->setApplicationTitle($wm_name); yui::YUI::app()->setApplicationIcon($wm_icon); -my $hostMan = AdminPanel::Module::Firewall->new({ +my $hostMan = ManaTools::Module::Firewall->new({ icon => $wm_icon, name => $wm_name }); diff --git a/scripts/mpan b/scripts/mpan index 3b1abd0..7666041 100755 --- a/scripts/mpan +++ b/scripts/mpan @@ -4,27 +4,27 @@ # Copyright 2013 - 2015 Matteo Pasotti # Copyright 2014 - 2015 Angelo Naselli # -# This file is part of AdminPanel +# This file is part of manatools # -# AdminPanel is free software: you can redistribute it and/or modify +# ManaTools is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 2 of the License, or # (at your option) any later version. # -# AdminPanel is distributed in the hope that it will be useful, +# ManaTools is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with AdminPanel. If not, see . +# along with ManaTools. If not, see . use strict; use warnings; use diagnostics; -use AdminPanel::Privileges; -use AdminPanel::SettingsReader; -use AdminPanel::MainDisplay; +use ManaTools::Privileges; +use ManaTools::SettingsReader; +use ManaTools::MainDisplay; use yui; my $cmdline = new yui::YCommandLine; @@ -39,7 +39,7 @@ if ($cmdline->find("--dev") > 0) { else { ask_for_authentication($settings->{priv_method}) if is_root_capability_required(); } -my $mainWin = new AdminPanel::MainDisplay(); +my $mainWin = new ManaTools::MainDisplay(); while (1) { my $launch = $mainWin->start(); @@ -64,7 +64,7 @@ sub usage { # and it is overriden by --conf_dir, so it should be discussed better to understand # if it is really needed any more. # Window title is got from settings.conf (key title) - print "\t--name string specify the window title of the administration panel\n"; + print "\t--name string specify the window title of the mana-tools panel\n"; print "\t--conf_dir path specify the settings.conf file directory\n"; print "\n"; exit(0); @@ -88,7 +88,7 @@ sub getSettings { } # configuration file name my $fileName = "$confDir/settings.conf"; - return new AdminPanel::SettingsReader($fileName); + return new ManaTools::SettingsReader($fileName); } =pod -- cgit v1.2.1