summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Gtk2::Pango -> PangoThierry Vignaud2013-11-243-10/+10
|
* use (my|u)gtk3 instead of *tk2Thierry Vignaud2013-11-2435-258/+258
|
* forkedThierry Vignaud2013-11-242-0/+3250
|
* rename for gtk+3Thierry Vignaud2013-11-242-0/+0
|
* convert from mygtk2 to ugtk2Thierry Vignaud2013-11-245-11/+11
| | | | (needed for next commits)
* Merge branch 'master' of git://git.mageia.org/software/drakxfilip2013-11-244-118/+71
|\
| * Update Spanish translationYuri Chornoivan2013-11-241-47/+37
| |
| * Update Spanish translationYuri Chornoivan2013-11-241-64/+25
| |
| * make translations homogeneous (& smaller...)Thierry Vignaud2013-11-241-4/+4
| |
| * beautifyThierry Vignaud2013-11-241-3/+5
| |
* | Slovenian translation updatedfilip2013-11-241-4/+4
|/
* draksec: Make sure to restart polkitd after writing new rulesColin Guthrie2013-11-242-3/+6
| | | | | | Also do not try to rm the file if it does not exist (it seems to complain and then exit if you try to do it on a non-existant file - which means the function is not named nicely as -f to rm should make it ignore this)
* Update French translation by DuneYuri Chornoivan2013-11-231-38/+43
|
* Update French translation by DuneYuri Chornoivan2013-11-231-62/+26
|
* timezone: As we will install chrony, assume that when nothing is installed.Colin Guthrie2013-11-232-4/+5
|
* draksec: drakbackup seems dead.Colin Guthrie2013-11-211-1/+1
| | | | Remove it from the list, but keep the i18n bits just in case it returns.
* draksec: Rename binaries for new policy file nameColin Guthrie2013-11-211-9/+9
|
* draksec: Use 'Administrator password' rather than 'Root password'.Colin Guthrie2013-11-2172-72/+72
| | | | | | | | This is more accurate as you can override polkit configuration such that any user in the wheel group will acceptable rather than the 'root' user specifically. Keep existing translations however to avoid unnecessary churn.
* polkit: Add support to draksec for writing polkit policy override rules.Colin Guthrie2013-11-214-17/+54
| | | | This allows draksec to override things properly under polkit.
* 15.73.115.73.1Thierry Vignaud2013-11-193-1/+5
|
* fix passing arguments from drakx-in-chroot in debug modeThierry Vignaud2013-11-182-1/+3
|
* do not compile/include xhost+ anymore (unused for years)Thierry Vignaud2013-11-183-3/+2
|
* Updated Turkish translationtarakbumba2013-11-181-5/+5
|
* Fix string comparison in chrony supportColin Guthrie2013-11-171-1/+1
| | | | My bad, not David's
* Add chrony support to drakclock mga#11092David Walser2013-11-176-27/+49
| | | | | | | | | | | v2 (by Colin Guthrie) * Fix external variable reference (my -> our + $ when using it) * Drop systemd cgroup filesystem check as the path has changed now (prefer "systemctl is-active foo.service" instead) * Add iburst to chrony config server definitions (triggers sync at startup) * Don't use ntpdate with chrony - rather chronyc waitsync * Don't bother checking for ntp in finish-install - just use chrony
* 2.2Anne Nicolas2013-11-132-1/+3
|
* log why updates were not appliedThierry Vignaud2013-11-132-2/+10
| | | | | log a nice message (urpmi not found or no network) instead of a silent missing feature
* images/kernel: Pass the modules we need to be in modules.alias through to ↵Colin Guthrie2013-11-133-1/+18
| | | | | | | | | | | | | | dracut. The installer needs to have the modules.alias information for more kernel modules than are actually included. In order to do this we need to use and environment variable as there is no sensible way to do this via dracut command line arguments. The mgainstaller dracut module will need updating accordingly. This should solve the problem where Sound Cards are shown as 'not configured' at the end of the install.
* images: Add a way to put an automatic method on boot.iso syslinux for testingColin Guthrie2013-11-132-0/+6
|
* include enough python in order to generate a stack trace from within stage2Thierry Vignaud2013-11-132-0/+7
|
* simplify: drop $STAGE1_LIBCThierry Vignaud2013-11-122-7/+5
|
* simplify, we only have one libcThierry Vignaud2013-11-121-3/+2
|
* simplify after previous commit: drop $DIETThierry Vignaud2013-11-121-9/+9
|
* support dynamic linking onlyThierry Vignaud2013-11-123-34/+2
|
* explain how to get a stack traceThierry Vignaud2013-11-121-1/+21
|
* perl-install: 15.7315.73Colin Guthrie2013-11-123-1/+5
|
* polkit: fix wrappers to properly escape arguments when calling the binaryColin Guthrie2013-11-123-1/+5
|
* Fix Tamil PO-fileYuri Chornoivan2013-11-111-1/+1
|
* 15.72.215.72.2Thomas Backlund2013-11-112-1/+3
|
* properly escape 5096UIDThomas Backlund2013-11-112-2/+3
|
* use 500 instead of 500Thomas Backlund2013-11-102-1/+3
|
* 15.72.115.72.1Thomas Backlund2013-11-092-1/+3
|
* fix typo in last Makefile changeThomas Backlund2013-11-092-1/+3
|
* 15.7215.72Thomas Backlund2013-11-091-0/+2
|
* use /usr/libexec/drakrpm-addmedia directly in stage2 (colin, #11319)Thomas Backlund2013-11-092-1/+2
|
* 15.72Thomas Backlund2013-11-092-1/+3
|
* - dont remove radeon-firmware or any network related firmwares as weThomas Backlund2013-11-092-1/+4
| | | | dont know when some hw gets plugged that needs it
* add missing python modules for gdbThierry Vignaud2013-11-082-0/+3
|
* fix building debug image with latest gdbThierry Vignaud2013-11-082-14/+6
|
* 15.7115.71Anne Nicolas2013-11-082-1/+4
|
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-07 05:33:48 +0000
t">, '240'), ); push @options, $xpmac_opts !~ /ofonly/ ? ('-mode', '17', '-depth', '32') : '-mach64' if $server =~ /Xpmac/; push @options, '-fp', '/usr/X11R6/lib/X11/fonts:unscaled' if $server =~ /Xsun|Xpmac/; push @options, '-ac', '-geometry', $o->{vga16} ? '640x480' : '800x600' if $server eq 'Xnest'; unless (fork()) { exec $server, @options or exit 1; } foreach (1..60) { sleep 1; log::l("Server died"), return 0 if !$ok; if (c::Xtest($wanted_DISPLAY)) { if (-x '/usr/bin/aewm-drakx') { fork() || exec("aewm-drakx") || c::_exit(0); } return 1; } } log::l("Timeout!!"); 0; }; my @servers = qw(FBDev VGA16); #-) if ($::testing) { @servers = 'Xnest'; } elsif (arch() eq "alpha") { require Xconfig::card; my ($card) = Xconfig::card::probe(); Xconfig::card::add_to_card__using_Cards($card, $card->{type}) if $card && $card->{type}; @servers = $card->{server} || "TGA"; #-@servers = qw(SVGA 3DLabs TGA) } elsif (arch() =~ /^sparc/) { local $_ = cat_("/proc/fb"); if (/Mach64/) { @servers = qw(Mach64); } elsif (/Permedia2/) { @servers = qw(3DLabs); } else { @servers = qw(Xsun24); } } elsif (arch() =~ /ia64|x86_64/) { require Xconfig::card; my ($card) = Xconfig::card::probe(); @servers = map { if_($_, "Driver:$_") } $card && $card->{Driver}, 'fbdev'; } elsif (arch() eq "ppc") { @servers = qw(Xpmac); } foreach (@servers) { log::l("Trying with server $_"); my $dir = "/usr/X11R6/bin"; my ($prog, $Driver) = /Driver:(.*)/ ? ('XFree86', $1) : /Xsun|Xpmac|Xnest/ ? $_ : "XF86_$_"; unless (-x "$dir/$prog") { unlink $_ foreach glob_("$dir/X*"); install_any::getAndSaveFile("Mandrake/mdkinst$dir/$prog", "$dir/$prog") or die "failed to get server $prog: $!"; chmod 0755, "$dir/$prog"; } if (/FB/) { !$o->{vga16} && $o->{allowFB} or next; $o->{allowFB} = &$launchX($prog, $Driver) #- keep in mind FB is used. and goto OK; } else { $o->{vga16} = 1 if /VGA16/; &$launchX($prog, $Driver) and goto OK; } } return undef; } OK: $ENV{DISPLAY} = $wanted_DISPLAY; install_gtk::init_gtk(); install_gtk::init_sizes(); install_gtk::install_theme($o); install_gtk::create_logo_window($o); install_gtk::create_steps_window($o); $ugtk2::force_center = [ $::rootwidth - $::windowwidth, $::logoheight, $::windowwidth, $::windowheight ]; $o = (bless {}, ref($type) || $type)->SUPER::new($o); $o->interactive::gtk::new; $o; } sub enteringStep { my ($o, $step) = @_; printf "Entering step `%s'\n", $o->{steps}{$step}{text}; $o->SUPER::enteringStep($step); install_gtk::update_steps_position($o); # install_gtk::create_help_window($o); #- HACK: without this it doesn't work (reaches step doPartitionDisks then fail) } sub leavingStep { my ($o, $step) = @_; $o->SUPER::leavingStep($step); } sub charsetChanged { my ($o) = @_; Gtk2->set_locale; install_gtk::load_font($o); install_gtk::create_steps_window($o); } #-###################################################################################### #- Steps Functions #-###################################################################################### sub selectLanguage { my ($o, $first_time) = @_; $o->SUPER::selectLanguage; $o->ask_warn('', formatAlaTeX(N("Your system is low on resources. You may have some problem installing Mandrake Linux. If that occurs, you can try a text install instead. For this, press `F1' when booting on CDROM, then enter `text'."))) if $first_time && availableRamMB() < 70; # 70MB } #------------------------------------------------------------------------------ sub selectMouse { my ($o, $force) = @_; my %old = %{$o->{mouse}}; $o->SUPER::selectMouse($force) or return; my $mouse = $o->{mouse}; $mouse->{type} eq 'none' || $old{type} eq $mouse->{type} && $old{name} eq $mouse->{name} && $old{device} eq $mouse->{device} && !$force and return; local $ugtk2::grab = 1; #- unsure a crazy mouse don't go wild clicking everywhere while (1) { my $xId = mouse::xmouse2xId($mouse->{XMOUSETYPE}); my $x_protocol_changed = $old{device} ne $mouse->{device} || $xId != mouse::xmouse2xId($old{XMOUSETYPE}); if ($x_protocol_changed) { log::l("telling X server to use another mouse"); eval { modules::load('serial') } if $mouse->{device} =~ /ttyS/; if (!$::testing) { devices::make($mouse->{device}); symlinkf($mouse->{device}, "/dev/mouse"); c::setMouseLive($ENV{DISPLAY}, $xId, $mouse->{nbuttons} < 3); } } mouse::test_mouse_install($mouse, $x_protocol_changed) and return; %old = %$mouse; $o->SUPER::selectMouse(1); $mouse = $o->{mouse}; } } sub reallyChooseGroups { my ($o, $size_to_display, $individual, $val) = @_; my $w = ugtk2->new(''); my $tips = Gtk2::Tooltips->new; my $w_size = Gtk2::Label->new(&$size_to_display); my $entry = sub { my ($e) = @_; my $text = translate($o->{compssUsers}{$e}{label}); my $help = translate($o->{compssUsers}{$e}{descr}); my $check = Gtk2::CheckButton->new($text); $check->set_active($val->{$e}); $check->signal_connect(clicked => sub { $val->{$e} = $check->get_active; $w_size->set_label(&$size_to_display); }); gtkset_tip($tips, $check, $help); #gtkpack_(Gtk2::HBox->new(0, 0), 0, gtkpng($file), 1, $check); $check; }; my $entries_in_path = sub { my ($path) = @_; translate($path), map { $entry->($_) } grep { $o->{compssUsers}{$_}{path} eq $path } @{$o->{compssUsersSorted}}; }; gtkadd($w->{window}, gtkpack_($w->create_box_with_title(N("Package Group Selection")), 1, gtkpack_(Gtk2::VBox->new(0, 0), 1, gtkpack_(Gtk2::HBox->new(0, 0), $o->{meta_class} eq 'server' ? ( 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Server'), ), 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Graphical Environment'), '', $entries_in_path->('Development'), '', $entries_in_path->('Utilities'), ), ) : $o->{meta_class} eq 'desktop' ? ( 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Workstation'), ), ) : ( 1, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Workstation'), '', $entry->('Development|Development'), $entry->('Development|Documentation'), $entry->('Development|LSB'), ), 0, gtkpack(Gtk2::VBox->new(0, 0), $entries_in_path->('Server'), '', $entries_in_path->('Graphical Environment'), ), ), )), 1, '', 0, gtkadd(Gtk2::HBox->new(0, 0), gtksignal_connect(Gtk2::Button->new(N("Help")), clicked => $o->interactive_help_sub_display_id('choosePackages')), $w_size, if_($individual, do { my $check = Gtk2::CheckButton->new(N("Individual package selection")); $check->set_active($$individual); $check->signal_connect(clicked => sub { $$individual = $check->get_active }); $check; }), gtksignal_connect(Gtk2::Button->new(N("Next ->")), clicked => sub { Gtk2->main_quit }), ), ), ); $w->main; 1; } sub choosePackagesTree { my ($o, $packages, $o_limit_to_medium) = @_; my $available = install_any::getAvailableSpace($o); my $availableCorrected = pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024); my $common; my $slow = sub { my ($func) = @_; gtkset_mousecursor_wait($common->{widgets}{tree}->window); ugtk2::flush(); $func->(); gtkset_mousecursor_normal($common->{widgets}{tree}->window); }; $common = { get_status => sub { my $size = pkgs::selectedSize($packages); N("Total size: %d / %d MB", pkgs::correctSize($size / sqr(1024)), $available / sqr(1024)); }, node_state => sub { my $p = pkgs::packageByName($packages, $_[0]) or return; pkgs::packageMedium($packages, $p)->{selected} or return; $p->arch eq 'src' and return; $p->flag_base and return 'base'; $p->flag_installed && !$p->flag_upgrade and return 'installed'; $p->flag_selected and return 'selected'; return 'unselected'; }, build_tree => sub { my ($add_node, $flat) = @_; if ($flat) { foreach (sort map { $_->name } grep { !$o_limit_to_medium || pkgs::packageMedium($packages, $_) == $o_limit_to_medium } @{$packages->{depslist}}) { $add_node->($_, undef); } } else { foreach my $root (@{$o->{compssUsersSorted}}) { my (%fl, @firstchoice, @others); #$fl{$_} = $o->{compssUsersChoice}{$_} foreach @{$o->{compssUsers}{$root}{flags}}; #- FEATURE:improve choce of packages... $fl{$_} = 1 foreach @{$o->{compssUsers}{$root}{flags}}; foreach my $p (@{$packages->{depslist}}) { !$o_limit_to_medium || pkgs::packageMedium($packages, $p) == $o_limit_to_medium or next; my @flags = $p->rflags; next if !($p->rate && any { any { !/^!/ && $fl{$_} } split('\|\|') } @flags); $p->rate >= 3 ? push(@firstchoice, $p->name) : push(@others, $p->name); } my $root2 = join('|', map { translate($_) } split('\|', $root)); $add_node->($_, $root2) foreach sort @firstchoice; $add_node->($_, $root2 . '|' . N("Other")) foreach sort @others; } } }, get_info => sub { my $p = pkgs::packageByName($packages, $_[0]) or return ''; $slow->(sub { pkgs::extractHeaders($o->{prefix}, [$p], $packages->{mediums}) }); my $imp = translate($pkgs::compssListDesc{$p->flag_base ? 5 : $p->rate}); my $tag = { 'foreground' => 'royalblue3' }; $@ ? N("Bad package") : [ [ N("Name: "), $tag ], [ $p->name . "\n" ], [ N("Version: "), $tag ], [ $p->version . '-' . $p->release . "\n" ], [ N("Size: "), $tag ], [ N("%d KB\n", $p->size / 1024) ], if_($imp, [ N("Importance: "), $tag ], [ "$imp\n" ]), [ "\n" ], [ formatLines(c::from_utf8($p->description)) ] ]; }, toggle_nodes => sub { my $set_state = shift @_; my @n = map { pkgs::packageByName($packages, $_) } @_; my %l; my $isSelection = !$n[0]->flag_selected; $slow->(sub { foreach (@n) { #pkgs::togglePackageSelection($packages, $_, my $l = {}); #@l{grep {$l->{$_}} keys %$l} = (); pkgs::togglePackageSelection($packages, $_, \%l); } }); if (my @l = map { $packages->{depslist}[$_]->name } keys %l) { #- check for size before trying to select. my $size = pkgs::selectedSize($packages); foreach (@l) { my $p = pkgs::packageByName($packages, $_); $p->flag_selected or $size += $p->size; } if (pkgs::correctSize($size / sqr(1024)) > $available / sqr(1024)) { return $o->ask_warn('', N("You can't select this package as there is not enough space left to install it")); } @l > @n && $common->{state}{auto_deps} and $o->ask_okcancel('', [ $isSelection ? N("The following packages are going to be installed") : N("The following packages are going to be removed"), common::formatList(20, sort @l) ], 1) || return; if ($isSelection) { pkgs::selectPackage($packages, $_) foreach @n; } else { pkgs::unselectPackage($packages, $_) foreach @n; } foreach (@l) { my $p = pkgs::packageByName($packages, $_); $set_state->($_, $p->flag_selected ? 'selected' : 'unselected'); } } else { $o->ask_warn('', N("You can't select/unselect this package")); } }, grep_allowed_to_toggle => sub { grep { my $p = pkgs::packageByName($packages, $_); $p && !$p->flag_base } @_; }, grep_unselected => sub { grep { !pkgs::packageByName($packages, $_)->flag_selected } @_; }, check_interactive_to_toggle => sub { my $p = pkgs::packageByName($packages, $_[0]) or return; if ($p->flag_base) { $o->ask_warn('', N("This is a mandatory package, it can't be unselected")); } elsif ($p->flag_installed && !$p->flag_upgrade) { $o->ask_warn('', N("You can't unselect this package. It is already installed")); } elsif ($p->flag_selected && $p->flag_installed) { if ($::expert) { $o->ask_yesorno('', N("This package must be upgraded.\nAre you sure you want to deselect it?")) or return; return 1; } else { $o->ask_warn('', N("You can't unselect this package. It must be upgraded")); } } else { return 1 } return; }, auto_deps => N("Show automatically selected packages"), interactive_help_id => 'choosePackagesTree', ok => N("Install"), cancel => N("<- Previous"), icons => [ { icon => 'floppy', help => N("Load/Save on floppy"), wait_message => N("Updating package selection"), code => sub { $o->loadSavePackagesOnFloppy($packages); 1 }, }, if_(0, { icon => 'feather', help => N("Minimal install"), code => sub { install_any::unselectMostPackages($o); pkgs::setSelectedFromCompssList($packages, { SYSTEM => 1 }, 4, $availableCorrected); 1; } }), ], state => { auto_deps => 1, flat => $o_limit_to_medium, }, }; $o->ask_browse_tree_info('', N("Choose the packages you want to install"), $common); } #------------------------------------------------------------------------------ sub beforeInstallPackages { my ($o) = @_; $o->SUPER::beforeInstallPackages; install_any::copy_advertising($o); } #------------------------------------------------------------------------------ sub installPackages { my ($o, $packages) = @_; my ($current_total_size, $last_size, $nb, $total_size, $start_time, $last_dtime, $_trans_progress_total); my $w = ugtk2->new(N("Installing")); $w->sync; my $text = Gtk2::Label->new; my ($advertising, $change_time, $i); my $show_advertising if 0; $show_advertising = to_bool(@install_any::advertising_images) if !defined $show_advertising; my $detail_or_not = sub { $show_advertising ? N("Details") : N("No details") }; my ($msg, $msg_time_remaining, $msg_time_total) = map { Gtk2::Label->new($_) } '', (N("Estimating")) x 2; my ($progress, $progress_total) = map { Gtk2::ProgressBar->new } (1..2); gtkadd($w->{window}, my $box = Gtk2::VBox->new(0,10)); $box->pack_end(gtkshow(gtkpack(Gtk2::VBox->new(0,5), $msg, $progress, create_packtable({}, [N("Time remaining "), $msg_time_remaining], # [N("Total time "), $msg_time_total], ), $text, $progress_total, gtkadd(create_hbox(), my $cancel = Gtk2::Button->new(N("Cancel")), my $details = Gtk2::Button->new($detail_or_not->()), ), )), 0, 1, 0); $details->hide if !@install_any::advertising_images; $w->sync; $msg->set_label(N("Please wait, preparing installation...")); gtkset_mousecursor_normal($cancel->window); gtkset_mousecursor_normal($details->window); my $advertize = sub { @install_any::advertising_images or return; $show_advertising ? $_->hide : $_->show foreach $msg, $progress, $text; gtkdestroy($advertising) if $advertising; if ($show_advertising && $_[0]) { $change_time = time(); my $f = $install_any::advertising_images[$i++ % @install_any::advertising_images]; log::l("advertising $f"); my $pl = $f; $pl =~ s/\.png$/.pl/; my $icon_name = $f; $icon_name =~ s/\.png$/_icon.png/; my ($draw_text, $width, $height, $y_start, $title, @text); -e $pl and $draw_text = 1; eval(cat_($pl)) if $draw_text; my $pix = gtkcreate_pixbuf($f); my $dbl_area; my $darea = Gtk2::DrawingArea->new; gtkpack($box, $advertising = !$draw_text ? gtkcreate_img($f) : gtksignal_connect(gtkset_size_request($darea, $width, $height), expose_event => sub { my (undef, undef, $dx, $dy) = $darea->allocation->values; if (!defined($dbl_area)) { $darea->window->draw_rectangle($darea->style->bg_gc('active'), 1, 0, 0, $dx, $dy); $pix->render_to_drawable($darea->window, $darea->style->bg_gc('normal'), 0, 0, ($dx-$width)/2, 0, $width, $height, 'none', 0, 0); my ($width, $lines, $widths, $heights) = wrap_paragraph([ $title, '', @text ], $darea, 520); my $i = 0; foreach (@$lines) { my $layout = $darea->create_pango_layout($_); my $draw_lay = sub { my ($gc, $decx) = @_; $darea->window->draw_layout($gc, ($dx-$width)/2 + $widths->[$i] + $decx, $y_start + $heights->[$i], $layout); }; $draw_lay->($darea->style->black_gc, 0); $i == 0 and $draw_lay->($darea->style->black_gc, 1); $i++; } } })); } else { $advertising = undef; } }; $cancel->signal_connect(clicked => sub { $pkgs::cancel_install = 1 }); $details->signal_connect(clicked => sub { invbool \$show_advertising; $details->set_label($detail_or_not->()); $advertize->(1); }); $advertize->(); my $oldInstallCallback = \&pkgs::installCallback; local *pkgs::installCallback = sub { my ($data, $type, $id, $subtype, $amount, $total) = @_; if ($type eq 'user' && $subtype eq 'install') { #- $amount and $total are used to return number of package and total size. $nb = $amount; $total_size = $total; $current_total_size = 0; $start_time = time(); $msg->set_label(N("%d packages", $nb)); $w->flush; } elsif ($type eq 'inst' && $subtype eq 'start') { $progress->set_fraction(0); my $p = $data->{depslist}[$id]; $msg->set_label(N("Installing package %s", $p->name)); $current_total_size += $last_size; $last_size = $p->size; $text->set_label((split /\n/, c::from_utf8($p->summary))[0] || ''); $advertize->(1) if $show_advertising && $total_size > 20_000_000 && time() - $change_time > 20; $w->flush; } elsif ($type eq 'inst' && $subtype eq 'progress') { $progress->set_fraction($total ? $amount / $total : 0); my $dtime = time() - $start_time; my $ratio = $total_size == 0 ? 0 : pkgs::size2time($current_total_size + $amount, $total_size) / pkgs::size2time($total_size, $total_size); $ratio >= 1 and $ratio = 1; my $total_time = $ratio ? $dtime / $ratio : time(); $progress_total->set_fraction($ratio); if ($dtime != $last_dtime && $current_total_size > 80_000_000) { $msg_time_total->set_label(formatTime(10 * round($total_time / 10) + 10)); #- $msg_time_total->set_label(formatTimeRaw($total_time) . " " . formatTimeRaw($dtime / $ratio2)); $msg_time_remaining->set_label(formatTime(10 * round(max($total_time - $dtime, 0) / 10) + 10)); $last_dtime = $dtime; } $w->flush; } else { goto $oldInstallCallback } }; #- the modification is not local as the box should be living for other package installation. undef *install_any::changeMedium; *install_any::changeMedium = sub { my ($method, $medium) = @_; #- if not using a cdrom medium, always abort. if ($method eq 'cdrom' && !$::oem) { local $ugtk2::grab = 1; my $name = pkgs::mediumDescr($o->{packages}, $medium); local $| = 1; print "\a"; my $time = time(); my $r = $name !~ /commercial/i || ($o->{useless_thing_accepted2} ||= $o->ask_from_list_('', formatAlaTeX(install_messages::com_license()), [ N_("Accept"), N_("Refuse") ], "Accept") eq "Accept"); $r &&= $o->ask_okcancel('', N("Change your Cd-Rom! Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when done. If you don't have it, press Cancel to avoid installation from this Cd-Rom.", $name), 1); #- add the elapsed time (otherwise the predicted time will be rubbish) $start_time += time() - $time; return $r; } }; my $install_result; catch_cdie { $install_result = $o->install_steps::installPackages($packages) } sub { if ($@ =~ /^error ordering package list: (.*)/) { $o->ask_yesorno('', [ N("There was an error ordering packages:"), $1, N("Go on anyway?") ], 1) and return 1; ${$_[0]} = "already displayed"; } elsif ($@ =~ /^error installing package list: (.*)/) { $o->ask_yesorno('', [ N("There was an error installing packages:"), $1, N("Go on anyway?") ], 1) and return 1; ${$_[0]} = "already displayed"; } 0; }; if ($pkgs::cancel_install) { $pkgs::cancel_install = 0; die 'already displayed'; } $w->destroy; $install_result; } sub summary_prompt { my ($o, $l, $check_complete) = @_; my $w = ugtk2->new(''); my $set_entry_labels; my @table; my %group; foreach my $e (@$l) { $group{$e->{group}} ||= do { push @table, [ gtkpack__(Gtk2::HBox->new(0, 0), $e->{group}), '' ]; }; $e->{widget} = Gtk2::Label->new; $e->{widget}->set_property(wrap => 1); $e->{widget}->set_size_request($::windowwidth * 0.65, -1); push @table, [], [ gtkpack__(Gtk2::HBox->new(0, 30), '', $e->{widget}), gtksignal_connect(Gtk2::Button->new(N("Configure")), clicked => sub { $w->{rwindow}->hide; $e->{clicked}(); $w->{rwindow}->show; $set_entry_labels->(); }) ]; } $set_entry_labels = sub { foreach (@$l) { my $t = $_->{val}() || '<span foreground="red">' . N("not configured") . '</span>'; $_->{widget}->set_markup($_->{label} . ' - ' . $t); } }; $set_entry_labels->(); my $help_sub = $o->interactive_help_sub_display_id('summary'); gtkadd($w->{window}, gtkpack_(Gtk2::VBox->new(0,5), 1, create_scrolled_window(create_packtable({ mcc => 1 }, @table)), 0, $w->create_okcancel(undef, '', '', if_($help_sub, [ N("Help"), $help_sub, 1 ])) )); $w->main($check_complete); } 1;
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-07 05:33:45 +0000