From 8fca0c38d4cb54ecca849d8ecc6d15aec6b81dd6 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 6 Sep 2012 17:28:57 +0000 Subject: drop support for Enterprise & PowerPack media (mga#6292) --- mgaapplet_gui.pm | 76 -------------------------------------------------------- 1 file changed, 76 deletions(-) (limited to 'mgaapplet_gui.pm') diff --git a/mgaapplet_gui.pm b/mgaapplet_gui.pm index 8ac332ea..ebec40a3 100644 --- a/mgaapplet_gui.pm +++ b/mgaapplet_gui.pm @@ -42,10 +42,8 @@ our @EXPORT = qw( ); our @EXPORT_OK = qw( - $powerpack_ad run_ask_credentials_dialog run_no_rights_dialog - open_ask_powerpack_dialog ); use mygtk2 qw(gtknew); #- do not import gtkadd which conflicts with ugtk2 version @@ -77,32 +75,6 @@ our @common = ( width => $width - 50, ); -# List of widgets advertising Powerpack -our $powerpack_ad = [ - gtknew('Label_Left', - text => N("Mageia Powerpack brings you the best of Linux experience for desktop: stability and efficiency of open source solutions together with exclusive softwares and Mageia official support."), - @common), - gtknew('HButtonBox', - layout => 'center', - children_tight => [ - new_link_button( - 'http://www.mageia.org/', # FIXME: URL! - N("Mageia Linux Features") - ) - ]), - gtknew('Label_Left', - text => 'You can order now access for Powerpack', - ), - gtknew('HButtonBox', - layout => 'center', - children_tight => [ - new_link_button( - 'http://www.mageia.org/', # FIXME: URL! - N("Online subscription") - ) - ]), -]; - sub new_portable_dialog { my ($title) = @_; ugtk2->new($title, width => $width + 20); @@ -264,51 +236,3 @@ sub run_no_rights_dialog { ); fill_n_run_portable_dialog($w, \@widgets); } - -# Returns a string of user's choice: 'powerpack' or 'free'. -sub open_ask_powerpack_dialog { - my ($current_product, $new_version) = @_; - - # Setup powerpack offering radio buttons... - - my @radio_widgets; - my $rbutton; - # pwp/flash users will be offered powerpack by default - my $want_powerpack = $current_product =~ /powerpack|flash/i; - foreach my $product ($want_powerpack - ? ('powerpack', 'free') : ('free', 'powerpack')) { - my $info = mgaonline::get_product_info($product); - $rbutton - = Gtk2::RadioButton->new_with_label($rbutton - ? $rbutton->get_group - : undef, - $info->{name}); - $rbutton->signal_connect('toggled', - sub { - my ($button, $is_pwp) = @_; - $want_powerpack = $is_pwp - if $button->get_active; - }, - $product eq 'powerpack'); - push @radio_widgets, [ $rbutton, $info->{description} ]; - } - - # Setup dialog widgets... - - my $title = N("Choose your upgrade version"); - my $w = new_portable_dialog($title); - my @widgets - = (mgaonline::get_banner($current_product =~ /powerpack/i - ? N("Your Powerpack access has ended") - : $title), - gtknew('Label_Left', - text => N("%s is now available, you can upgrade to:", - $new_version), - @common), - gtknew('Table', children => \@radio_widgets, row_spacings => 10), - ugtk2::create_okcancel($w, N("Next"), N("Cancel")), - ); - - fill_n_run_portable_dialog($w, \@widgets) or return undef; - return $want_powerpack; -} -- cgit v1.2.1