summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2009-03-21 07:59:27 +0000
committerAnssi Hannula <anssi@mandriva.org>2009-03-21 07:59:27 +0000
commita503a328b3da32fe81fa5c95ddd33f82be308f5b (patch)
tree6e75c86ca9291313e6f3d4fe2d87ab949809abfe
parent207222716e10bb8e157c58894867b65703f39ebe (diff)
downloaddrakx-a503a328b3da32fe81fa5c95ddd33f82be308f5b.tar
drakx-a503a328b3da32fe81fa5c95ddd33f82be308f5b.tar.gz
drakx-a503a328b3da32fe81fa5c95ddd33f82be308f5b.tar.bz2
drakx-a503a328b3da32fe81fa5c95ddd33f82be308f5b.tar.xz
drakx-a503a328b3da32fe81fa5c95ddd33f82be308f5b.zip
12.17.1
Diffstat
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/NEWS4
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index ad9cb6b1d..0349eb013 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
# -*- Makefile -*-
-VERSION:=12.17
+VERSION:=12.17.1
SUDO = sudo
TMPDIR = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 6d397c947..4842fc7e7 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+Versino 12.17.1 - 21 March 2009
+
+- fix syntax error in nb translation file
+
Version 12.17 - 21 March 2009
- add infrastucture for detecting vmware
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-24 13:48:44 +0000
l($started);
+ $tbl->cellChanged($cell);
+ }
+}
+
## draw service panel and manage it
sub servicePanel {
my ($l, $on_services) = services();
my @xinetd_services = map { $_->[0] } xinetd_services();
- my $factory = yui::YUI::widgetFactory;
+ my $mageiaPlugin = "mga";
+ my $factory = yui::YUI::widgetFactory;
+ my $mgaFactory = yui::YExternalWidgets::externalWidgetFactory($mageiaPlugin);
+ $mgaFactory = yui::YMGAWidgetFactory::getYMGAWidgetFactory($mgaFactory);
+
my $dialog = $factory->createMainDialog;
my $vbox = $factory->createVBox( $dialog );
my $frame = $factory->createFrame ($vbox, N("Services"));
- $frame->setWeight(0, 40);
my $frmVbox = $factory->createVBox( $frame );
-
- ## service list (serviceBox)
- my $serviceBox = $factory->createSelectionBox($frmVbox, "" );
- $serviceBox->setNotify(1);
+ my $hbox = $factory->createHBox( $frmVbox );
- my $itemCollection = new yui::YItemCollection;
+ my $yTableHeader = new yui::YTableHeader();
+ $yTableHeader->addColumn(N("Service"), $yui::YAlignBegin);
+ $yTableHeader->addColumn(N("Status"), $yui::YAlignCenter);
+ $yTableHeader->addColumn(N("On boot"), $yui::YAlignBegin);
+ ## service list (serviceBox)
+ my $serviceTbl = $mgaFactory->createCBTable($hbox, $yTableHeader, $yui::YCBTableCheckBoxOnLastColumn);
+ my $itemCollection = new yui::YItemCollection;
foreach (@$l) {
my $serviceName = $_;
- my $item = new yui::YItem($serviceName);
+ my $item = new yui::YCBTableItem($serviceName);
+ my $started = (is_service_running($serviceName)? N("running") : N("stopped"));
+# TODO add icon green/red led
+ my $cell = new yui::YTableCell($started);
+ $item->addCell($cell);
+ $item->check(member($serviceName, @$on_services));
+ $item->setLabel($serviceName);
$itemCollection->push($item);
$item->DISOWN();
}
- $serviceBox->addItems($itemCollection);
- $factory->createVSpacing($frmVbox, 1.0);
+ $serviceTbl->addItems($itemCollection);
+ $serviceTbl->setImmediateMode(1);
+ $serviceTbl->setWeight(0, 50);
- my $hbox = $factory->createHBox( $frmVbox );
## info panel (infoPanel)
$frame = $factory->createFrame ($hbox, N("Information"));
- my $infoPanel = $factory->createRichText($frame, "--------------"); #, 0, 0);
- $infoPanel->setAutoScrollDown();
-
- ## status
- $frame = $factory->createFrame ($hbox, "");
+ $frame->setWeight(0, 30);
$frmVbox = $factory->createVBox( $frame );
- $frame = $factory->createFrame ($frmVbox, N("Status"));
- my $status = $factory->createLabel($frame, "++++++++++++++", 0, 0);
-
- ## on boot (onBoot)
- $factory->createVSpacing($frmVbox, 1.0);
- my $onBoot = $factory->createCheckBox($frmVbox, N("On boot"), 0);
- $onBoot->setNotify(1);
+ my $infoPanel = $factory->createRichText($frmVbox, "--------------"); #, 0, 0);
+ $infoPanel->setAutoScrollDown();
### Service Start button ($startButton)
- my $align = $factory->createAlignment( $hbox, $yui::YAlignEnd, $yui::YAlignUnchanged );
- $factory->createVSpacing($frmVbox, 8.0);
$hbox = $factory->createHBox( $frmVbox );
my $startButton = $factory->createPushButton($hbox, N("Start"));
@@ -252,17 +257,16 @@ sub servicePanel {
$factory->createVSpacing($vbox, 1.0);
## Window push buttons
$hbox = $factory->createHBox( $vbox );
- $align = $factory->createLeft($hbox);
+ my $align = $factory->createLeft($hbox);
$hbox = $factory->createHBox($align);
my $aboutButton = $factory->createPushButton($hbox, N("About") );
$align = $factory->createRight($hbox);
$hbox = $factory->createHBox($align);
my $closeButton = $factory->createPushButton($hbox, N("Close") );
-
#first item status
- my $item = $serviceBox->selectedItem();
- serviceStatus($item->label(), $on_services, $status, $infoPanel, $onBoot) if ($item);
+ my $item = $serviceTbl->selectedItem();
+ serviceInfo($item->label(), $infoPanel) if ($item);
while(1) {
my $event = $dialog->waitForEvent();
@@ -295,35 +299,33 @@ sub servicePanel {
N("_: Translator(s) name(s) & email(s)\n")}
);
}
- elsif ($widget == $serviceBox) {
+ elsif ($widget == $serviceTbl) {
# service selection changed
- $item = $serviceBox->selectedItem();
- serviceStatus($item->label(), $on_services, $status, $infoPanel, $onBoot) if ($item);
- }
- elsif ($widget == $onBoot) {
- $item = $serviceBox->selectedItem();
+ $item = $serviceTbl->selectedItem();
+ serviceInfo($item->label(), $infoPanel) if ($item);
+ $item = $serviceTbl->changedItem();
if ($item) {
- _set_service( $item->label(), $onBoot->isChecked());
+ _set_service($item->label(), $item->checked());
# we can push/pop service, but this (slower) should return real situation
($l, $on_services) = services();
}
}
elsif ($widget == $startButton) {
- $item = $serviceBox->selectedItem();
+ $item = $serviceTbl->selectedItem();
if ($item) {
restart_or_start($item->label());
# we can push/pop service, but this (slower) should return real situation
($l, $on_services) = services();
- serviceStatus($item->label(), $on_services, $status, $infoPanel, $onBoot);
+ serviceStatus($serviceTbl, $item);
}
}
elsif ($widget == $stopButton) {
- $item = $serviceBox->selectedItem();
+ $item = $serviceTbl->selectedItem();
if ($item) {
stop($item->label());
# we can push/pop service, but this (slower) should return real situation
($l, $on_services) = services();
- serviceStatus($item->label(), $on_services, $status, $infoPanel, $onBoot);
+ serviceStatus($serviceTbl, $item);
}
}
}
diff --git a/AdminPanel/Users/GUsers.pm b/AdminPanel/Users/GUsers.pm
index 1baaeefc..12aa32fe 100644
--- a/AdminPanel/Users/GUsers.pm
+++ b/AdminPanel/Users/GUsers.pm
@@ -48,8 +48,7 @@ our @EXPORT = qw(addUserDialog
);
-sub labeledFrameBox
-{
+sub labeledFrameBox {
my ($parent, $label) = @_;
my $factory = yui::YUI::widgetFactory;
generated by cgit v1.2.1 (git 2.21.0) at 2026-05-24 13:48:43 +0000