1 files changed, 15 insertions, 15 deletions

diff --git a/perl-install/standalone/po/uk.po b/perl-install/standalone/po/uk.po
index c823ef605..913fedb7d 100644
--- a/perl-install/standalone/po/uk.po
+++ b/perl-install/standalone/po/uk.po
@@ -10,16 +10,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx_standalone\n"
-"POT-Creation-Date: 2011-05-17 17:47+0200\n"
-"PO-Revision-Date: 2011-05-07 13:06+0300\n"
+"POT-Creation-Date: 2011-05-17 19:40+0300\n"
+"PO-Revision-Date: 2011-05-17 19:41+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<"
+"=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Lokalize 1.2\n"
 
 #: display_help:54 display_help:59 drakbug:186 drakperm:136
@@ -3023,17 +3023,17 @@ msgid ""
 "More info in the driver's manual page. Run the command \"man sane-%s\" to "
 "read it."
 msgstr ""
-"Детальніше читайте в документації до драйвера. Виконайте команду \"man sane-"
-"%s\", щоб прочитати її."
+"Детальніше читайте в документації до драйвера. Виконайте команду \"man sane-%"
+"s\", щоб прочитати її."
 
 #: scannerdrake:409 scannerdrake:418
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "After that you may scan documents using \"XSane\" or \"%s\" from Multimedia/"
 "Graphics in the applications menu."
 msgstr ""
 "Після цього ви зможете сканувати документи з допомогою \"XSane\" або "
-"\"Skanlite\" з меню програм «Звук і відео/Графіка»."
+"\"%s\" з меню програм «Звук і відео/Графіка»."
 
 #: scannerdrake:413
 #, c-format
@@ -3064,14 +3064,14 @@ msgid "Congratulations!"
 msgstr "Вітання!"
 
 #: scannerdrake:421
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Your %s has been configured.\n"
 "You may now scan documents using \"XSane\" or \"%s\" from Multimedia/"
 "Graphics in the applications menu."
 msgstr ""
 "Ваш %s було налаштовано.\n"
-"Тепер ви можете сканувати документи з допомогою \"XSane\" або \"Skanlite\" з "
+"Тепер ви можете сканувати документи з допомогою \"XSane\" або \"%s\" з "
 "меню програм «Звук і відео/Графіка»."
 
 #: scannerdrake:446
@@ -3290,8 +3290,7 @@ msgstr "Новий випуск, повторне налаштування гр�
 #, c-format
 msgid "The proprietary kernel driver was not found for '%s' X.org driver"
 msgstr ""
-"Для драйвера X.org «%s» не знайдено відповідного пропрієтарного драйвера "
-"ядра."
+"Для драйвера X.org «%s» не знайдено відповідного пропрієтарного драйвера ядра."
 
 #: service_harddrake:293
 #, c-format
@@ -3343,8 +3342,8 @@ msgid ""
 msgstr ""
 "Для запобігання завантаженню драйвера KMS ядра під час завантаження системи, "
 "поточний налаштований драйвер вимагає використання параметра завантаження "
-"«nokmsboot». Якщо цей параметр не буде вказано, ймовірно, запустити "
-"графічний сервер не вдасться."
+"«nokmsboot». Якщо цей параметр не буде вказано, ймовірно, запустити графічний "
+"сервер не вдасться."
 
 #: service_harddrake:445
 #, c-format
@@ -3389,3 +3388,4 @@ msgstr "Налаштування мови і країни"
 #: ../menu/localedrake-user.desktop.in.h:2
 msgid "Regional Settings"
 msgstr "Регіональні налаштування"
+

path: root/perl-install/bootlook.pm

package bootlook;

# Control-center

# Copyright (C) 2001-2002 MandrakeSoft
# Yves Duret <yduret at mandrakesoft.com>
#
# This program 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, or (at your option)
# any later version.
#
# This program 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 this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.


use common;
use Config;
use POSIX;
use interactive;
use standalone;
use Xconfig::various;
use any;
use log;
use bootloader;
use fs;
use ugtk2 qw(:helpers :wrappers :create);

my $in = 'interactive'->vnew('su', 'default');

my @winm;
my @usernames = list_users();

my $no_bootsplash;
my $x_mode = Xconfig::various::runlevel() == 5;
my $a_mode = -e "/etc/aurora/Monitor" ? 1 : 0;
my $auto_mode = any::get_autologin();
my $inmain = 0;
my $lilogrub = chomp_(`detectloader -q`);

my $window = $::isEmbedded ? new Gtk2::Plug($::XID) : new Gtk2::Window("toplevel");
$window->signal_connect(delete_event => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk2->exit(0) });
$window->set_title(N("Boot Style Configuration"));
$window->set_border_width(2);
#$window->realize;

# drakX mode
#my ($t_pixmap, $t_mask) = gtkcreate_img("tradi.png");
#my ($h_pixmap, $h_mask) = gtkcreate_img("hori.png");
#my ($v_pixmap, $v_mask) = gtkcreate_img("verti.png");
#my ($g_pixmap, $g_mask) = gtkcreate_img("gmon.png");
#my ($c_pixmap, $c_mask) = gtkcreate_img("categ.png");

# a pixmap widget to contain the pixmap
#my $pixmap = new Gtk2::Pixmap($h_pixmap, $h_mask);

### menus definition
# the menus are not shown
# but they provides shiny shortcut like C-q
my @menu_items = ({ path => N("/_File"), type => '<Branch>' },
		  { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback    => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk2->exit(0) } },
		 );
my $menubar = create_factory_menu($window, @menu_items);
######### menus end

my $user_combo = new Gtk2::Combo;
$user_combo->set_popdown_strings(@usernames);
$user_combo->entry->set_text($auto_mode->{autologin}) if $auto_mode->{autologin};
my $desktop_combo = new Gtk2::Combo;
$desktop_combo->set_popdown_strings(get_wm());
$desktop_combo->entry->set_text($auto_mode->{desktop}) if $auto_mode->{desktop};
my $a_c_button = new Gtk2::RadioButton(N("NewStyle Categorizing Monitor"));
my $a_h_button = new Gtk2::RadioButton(N("NewStyle Monitor"), $a_c_button);
my $a_v_button = new Gtk2::RadioButton(N("Traditional Monitor"), $a_c_button);
my $a_g_button = new Gtk2::RadioButton(N("Traditional Gtk+ Monitor"),$a_c_button);
my $a_button = new Gtk2::CheckButton(N("Launch Aurora at boot time"));
my $a_box = new Gtk2::VBox(0, 0);
my $x_box = new Gtk2::VBox(0, 0);
my $disp_mode = arch() =~ /ppc/ ? N("Yaboot mode") : N("Lilo/grub mode");

my %themes = 	('path' => '/usr/share/bootsplash/themes/',
		 'default' => 'Mandrake',
		 'def_thmb' => '/usr/share/libDrakX/pixmaps/nosplash_thumb.png',
		 'lilo' => {'file' => '/lilo/message',
			  'thumb' => '/lilo/thumb.png' },
		 'boot' => {'path' => '/images/',
		 	#'thumb'=>'/images/thumb.png',
			},
		 );
my ($cur_res) = cat_('/etc/lilo.conf') =~ /vga=(.*)/;
#- verify that current resolution is ok
if (member( $cur_res, qw( 785 788 791 794))) {
	($cur_res) = $bootloader::vga_modes{$cur_res} =~ /^([0-9x]+).*?$/;
} else {
	$no_bootsplash = 1;  #- we can't select any theme we're not in Framebuffer mode :-/
}

#- and check that lilo is the correct loader
$no_bootsplash ||= chomp_(`detectloader -q`) ne 'LILO';
my @thms;
my @lilo_thms = if_(!$themes{default}, qw(default));
my @boot_thms = if_(!$themes{default}, qw(default));
chdir($themes{path}); #- we must change directory for correct @thms assignement
foreach (all('.')) {
    if (-d $themes{path} . $_ && m/^[^.]/) {
	push @thms, $_;
	-f $themes{path} . $_ . $themes{lilo}{file} and push @lilo_thms, $_;
	-f $themes{path} . $_ . $themes{boot}{path} . "bootsplash-$cur_res.jpg" and push @boot_thms, $_;
    }
#       $_ eq $themes{'defaut'} and $default = $themes{'defaut'};
}
my %combo = ('thms' => '', 'lilo' => '', 'boot' => '');
foreach (keys(%combo)) {
    $combo{$_} = new Gtk2::Combo;
    $combo{$_}->set_value_in_list(1, 0);
}

$combo{thms}->set_popdown_strings(@thms);
$combo{lilo}->set_popdown_strings(@lilo_thms);
$combo{boot}->set_popdown_strings(@boot_thms) if !$no_bootsplash;

my ($lilo_pixbuf, $boot_pixmap);
my $lilo_pic = gtkcreate_img($themes{def_thmb});

my $boot_pixbuf;
my $boot_pic = gtkcreate_img($themes{def_thmb});

my $thm_button = new Gtk2::Button(N("Install themes"));
my $logo_thm = new Gtk2::CheckButton(N("Display theme\nunder console"));
my $B_create = new Gtk2::Button(N("Create new theme"));
my $keep_logo = 1;
$logo_thm->set_active(1);
$logo_thm->signal_connect(clicked => sub { invbool(\$keep_logo) });
$B_create->signal_connect(clicked => sub {
    $::isEmbedded ? (kill('USR1', $::CCPID) and system('/usr/sbin/draksplash ')) : system('/usr/sbin/draksplash ');
    });
#- ******** action to take on changing combos values

$combo{thms}->entry->signal_connect(changed => sub {
    my $thm_txt = $combo{thms}->entry->get_text();
    $combo{lilo}->entry->set_text(member($thm_txt, @lilo_thms) ? $thm_txt : $themes{default} || 'default');
    $combo{boot}->entry->set_text(member($thm_txt, @boot_thms) ? $thm_txt : $themes{default} || 'default');
    
});

$combo{lilo}->entry->signal_connect(changed => sub {
    my $new_file = $themes{path} . $combo{lilo}->entry->get_text() . $themes{lilo}{thumb};
    undef($lilo_pixbuf);
    $lilo_pixbuf = gtkcreate_pixbuf(-r $new_file ? $new_file : $themes{def_thmb});
    $lilo_pixbuf = $lilo_pixbuf->scale_simple(155, 116, 'nearest');
    $lilo_pic->set_from_pixbuf($lilo_pixbuf);
});

$no_bootsplash == 0 
	and $combo{boot}->entry->signal_connect( changed => sub {
    my $img_file = $themes{path}.$combo{boot}->entry->get_text().$themes{boot}{path}."bootsplash-$cur_res.jpg";
    undef($boot_pixmap);
    $boot_pixmap = gtkcreate_pixbuf( $img_file);
    $boot_pixmap = $boot_pixmap->scale_simple(155, 116, 'nearest');
    $boot_pic->set($boot_pixmap->render_pixmap_and_mask(0), '');
});

$combo{thms}->entry->set_text($themes{default});

$thm_button->signal_connect('clicked',

sub {
        my $error = 0;
        my $boot_conf_file = '/etc/sysconfig/bootsplash';
	my $lilomsg = '/boot/message-graphic';
      #lilo installation
      if (-f $themes{path}.$combo{lilo}->entry->get_text() . $themes{lilo}{file}) {
			use MDK::Common::File;
	    log::explanations(N("Backup %s to %s.old",$lilomsg,$lilomsg)); 
	    cp_af($lilomsg, "/boot/message-graphic.old");
	    #can't use this anymore or $in->ask_warn(N("Error"), N("unable to backup lilo message"));
	    log::explanations(N("Copy %s to %s", $themes{path} . $combo{lilo}->entry->get_text() . $themes{lilo}{file},$lilomsg)); 
	    cp_af($themes{path} . $combo{lilo}->entry->get_text() . $themes{lilo}{file}, $lilomsg);
			#can't use this anymore  or $in->ask_warn(N("Error"), N("can't change lilo message"));
	} else {
            $error = 1;
            $in->ask_warn(N("Error"), N("Lilo message not found"));
        }
        #bootsplash install
        if (-f $themes{path} . $combo{boot}->entry->get_text() . $themes{boot}{path} . "bootsplash-$cur_res.jpg") {
                my $bootsplash_cont = "# -*- Mode: shell-script -*-
# Specify here if you want add the splash logo to initrd when
# generating an initrd. You can specify :
#
# SPLASH=no to don't have a splash screen
#
# SPLASH=auto to make autodetect the splash screen
#
# SPLASH=INT When Integer could be 800x600 1024x768 1280x1024
#
SPLASH=$cur_res
# Choose the themes. The should be based in
# /usr/share/bootsplash/themes/
THEME=" . $combo{boot}->entry->get_text() . "
# Say yes here if you want to leave the logo on the console.
# Three options :
#
# LOGO_CONSOLE=no don't display logo under console.
#
# LOGO_CONSOLE=yes display logo under console.
#
# LOGO_CONSOLE=theme leave the theme to decide.
#
LOGO_CONSOLE=" . ($keep_logo ? 'yes' : 'no') . "\n";
                if (-f $boot_conf_file) {
                        eval { output($boot_conf_file, $bootsplash_cont) };
			$@ and $in->ask_warn(N("Error"), N("Can't write /etc/sysconfig/bootsplash.")) or log::explanations(N("Write %s",$boot_conf_file));
                } else {
                    $in->ask_warn(N("Error"), N("Can't write /etc/sysconfig/bootsplash\nFile not found."));
                    $error = 1;
                }
        } else {
                $in->ask_warn("Error", "BootSplash screen not found");
        }
        #here is mkinitrd time
        if (!$error) {
            foreach (map { if_(m|^initrd-(.*)\.img|, $1) } all('/boot')) {
                if (system("mkinitrd -f /boot/initrd-$_.img $_")) {
                    $in->ask_warn(N("Error"),
				  N("Can't launch mkinitrd -f /boot/initrd-%s.img %s.", $_,$_));
                    $error = 1;
                } else { 
		  log::explanations(N("Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'.", $_,$_));
		}
            }
        }
        if (system('lilo')) {
            $in->ask_warn(N("Error"),
N("Can't relaunch LiLo!
Launch \"lilo\" as root in command line to complete LiLo theme installation."));
            $error = 1;
        } else {
		log::explanations(N("Relaunch 'lilo'"));
	}
	$in->ask_warn($error ? N("Error") : N("Notice"),
		      $error ? N("Theme installation failed!") : N("LiLo and Bootsplash themes installation successfull"));
});

gtkadd($window,
       gtkpack__(my $global_vbox = new Gtk2::VBox(0,0),
		  gtkadd(new Gtk2::Frame($disp_mode),
#			  gtkpack__(new Gtk2::VBox(0,0),
				    (gtkpack_(gtkset_border_width(new Gtk2::HBox(0, 0),5),
					      1, N("You are currently using %s as your boot manager.
Click on Configure to launch the setup wizard.", $lilogrub),
					      0, gtksignal_connect(new Gtk2::Button(N("Configure")), clicked => $::lilo_choice),
					     )),
#				    "" #we need some place under the button -- replaced by gtkset_border_width( for the moment
#				   )
				     
			 ),
                #Splash Selector
                gtkadd(my $thm_frame = new Gtk2::Frame( N("Splash selection")),
                       gtkpack__(gtkset_border_width(new Gtk2::HBox(0,5),5),
                                 gtkpack__(new Gtk2::VBox(0,5),
                                           N("Themes"),
                                           $combo{thms},
                                           N("\nSelect the theme for\nlilo and bootsplash,\nyou can choose\nthem separately"),
                                           $logo_thm),
                                 gtkpack__(new Gtk2::VBox(0,5),
                                           N("Lilo screen"),
                                           $combo{lilo},
                                           $lilo_pic,
					   $B_create),
                                 gtkpack__(new Gtk2::VBox(0,5),
                                           N("Bootsplash"),
                                           $combo{boot},
                                           $boot_pic,
                                           $thm_button))
                      ),

		  # aurora
# 		  gtkadd (new Gtk2::Frame (N("Boot mode")),
# 			  gtkpack__ (new Gtk2::HBox(0,0),
# 				     gtkpack__ (new Gtk2::VBox(0, 5),
# 						gtksignal_connect ($a_button, clicked => sub {
# 								       if ($inmain) {
# 									   $a_box->set_sensitive(!$a_mode);
# 									   $a_mode = !$a_mode;
# 									   if ($a_mode) {
# 									       $pixmap->set($c_pixmap, $c_mask) if $a_c_button->get_active();
# 									       $pixmap->set($h_pixmap, $h_mask) if $a_h_button->get_active();
# 									       $pixmap->set($v_pixmap, $v_mask) if $a_v_button->get_active();
# 									       $pixmap->set($g_pixmap, $g_mask) if $a_g_button->get_active();
# 									   } else {
# 									       $pixmap->set($t_pixmap, $t_mask);
# 									   }
# 										   }
# 								   }),
# 						gtkpack__ (gtkset_sensitive ($a_box, $a_mode),
# 							    gtksignal_connect ($a_c_button,clicked => sub{$pixmap->set($c_pixmap, $c_mask)}),
# 							    gtksignal_connect ($a_h_button,clicked => sub{$pixmap->set($h_pixmap, $h_mask)}),
# 							    gtksignal_connect ($a_v_button,clicked => sub{$pixmap->set($v_pixmap, $v_mask)}),
# 							    gtksignal_connect ($a_g_button,clicked => sub{$pixmap->set($g_pixmap, $g_mask)})
# 							  )
# 					      ),
# 				     gtkpack__ (new Gtk2::HBox(0,0), $pixmap)
# 				    )
# 			 ),
		  # X
		  gtkadd(new Gtk2::Frame(N("System mode")),
			  gtkpack__(new Gtk2::VBox(0, 5),
				     gtksignal_connect(gtkset_active(new Gtk2::CheckButton(N("Launch the graphical environment when your system starts")), $x_mode), clicked => sub {
							   $x_box->set_sensitive(!$x_mode);
							   $x_mode = !$x_mode;
						       }),
				     gtkpack__(gtkset_sensitive($x_box, $x_mode),
						gtkset_active(my $x_no_button  = new Gtk2::RadioButton(N("No, I don't want autologin")), !$auto_mode->{autologin}),
						gtkpack__(new Gtk2::HBox(0, 10),
							   gtkset_active(my $x_yes_button = new Gtk2::RadioButton((N("Yes, I want autologin with this (user, desktop)")), $x_no_button), $auto_mode->{autologin}),
							   gtkpack__(new Gtk2::VBox(0, 10),
								     $user_combo,
								     $desktop_combo
								     )
							  )
					       )
				    )
			 ),
		 gtkadd(gtkset_layout(new Gtk2::HButtonBox, 'end'),
			 gtksignal_connect(new Gtk2::Button(N("OK")), clicked => sub { Xconfig::various::runlevel($x_mode ? 5 : 3); updateAutologin(); updateAurora(); $::isEmbedded ? kill('USR1',$::CCPID) : Gtk2->exit(0) }),
			 gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub { $::isEmbedded ? kill('USR1', $::CCPID) : Gtk2->exit(0) })
			)
	       )
      );

#$a_button->set_active($a_mode); # up == false == "0"
#if ($a_mode) {
#    my $a = readlink "/etc/aurora/Monitor";
#    $a =~ s#/lib/aurora/Monitors/##;
#    if ($a eq "NewStyle-Categorizing-WsLib") { $a_c_button->set_active(1); $pixmap->set($c_pixmap, $c_mask) }
#    if ($a eq "NewStyle-WsLib") { $a_h_button->set_active(1);  $pixmap->set($h_pixmap, $h_mask) }
#    if ($a eq "Traditional-WsLib") { $a_v_button->set_active(1); $pixmap->set($v_pixmap, $v_mask) }  
#    if ($a eq "Traditional-Gtk+") { $a_g_button->set_active(1); $pixmap->set($g_pixmap, $g_mask) }
#} else {
##    $pixmap->set($t_pixmap, $t_mask);
#}

$window->show_all();
$no_bootsplash and $thm_frame->hide();
gtkflush();
$::isEmbedded and kill 'USR2', $::CCPID;
$inmain = 1;
Gtk2->main;
Gtk2->exit(0);

#-------------------------------------------------------------
# get user names to put in combo  
#-------------------------------------------------------------


sub get_wm {
    @winm = split(' ', `/usr/sbin/chksession -l`);
}

#-------------------------------------------------------------
# aurora functions
#-------------------------------------------------------------



sub updateAurora {
    if ($a_mode) {
        if ($a_c_button->get_active()) {
            symlinkf("/lib/aurora/Monitors/NewStyle-Categorizing-WsLib",    "/etc/aurora/Monitor");
            $in->do_pkgs->install(q(Aurora-Monitor-NewStyle-Categorizing-WsLib)) if !(-e "/lib/aurora/Monitors/NewStyle-Categorizing-WsLib");
        }
        if ($a_h_button->get_active()) {
            symlinkf("/lib/aurora/Monitors/NewStyle-WsLib",    "/etc/aurora/Monitor");
            $in->do_pkgs->install(q(Aurora-Monitor-NewStyle-WsLib)) if !(-e "/lib/aurora/Monitors/NewStyle-WsLib");
        }
        if ($a_v_button->get_active()) {
            symlinkf("/lib/aurora/Monitors/Traditional-WsLib", "/etc/aurora/Monitor");
            $in->do_pkgs->install(q(Aurora-Monitor-Traditional-WsLib)) if !(-e "/lib/aurora/Monitors/Traditional-WsLib");
        }
        if ($a_g_button->get_active()) {
            symlinkf("/lib/aurora/Monitors/Traditional-Gtk+",  "/etc/aurora/Monitor");
            $in->do_pkgs->install(q(Aurora-Monitor-Traditional-Gtk+)) if !(-e "/lib/aurora/Monitors/Traditional-Gtk+");
	}
    } else {
	unlink "/etc/aurora/Monitor";
    }
    
}

#-------------------------------------------------------------
# launch autologin functions
#-------------------------------------------------------------

sub updateAutologin {
    my ($usern, $deskt) = ($user_combo->entry->get_text(), $desktop_combo->entry->get_text());
    if ($x_yes_button->get_active()) {
	$in->do_pkgs->install('autologin') if $x_mode;
	any::set_autologin($usern, $deskt);
    } else {
	any::set_autologin(undef) if $x_no_button->get_active();
    }
}