Merge branch 'master' of git://git.mageia.org/software/drakx

6 files changed, 40 insertions, 15 deletions

diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 693c40398..7d7164de7 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
 # -*- Makefile -*-
-VERSION:=16.25
+VERSION:=16.26.1
 
 SUDO        = sudo
 TMPDIR      = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1e213a6c9..41c705dae 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,14 @@
+Version 16.26.1 - 20 January 2014
+
+- diskdrake:
+  o increase back minimum partition width for Oxygen (mga#11977)
+
+Version 16.26 - 20 January 2014
+
+- diskdrake:
+  o fix sizing partition widgets
+  o revert minimum partition width to its pre-gtk3 value
+
 Version 16.23 - 16 January 2014
 
 - dont remove pulseaudio-module-bluetooth (mga#12323)
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index e01f65b2b..653320697 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -327,7 +327,11 @@ sub create_automatic_notebooks {
 sub create_buttons4partitions {
     my ($kind, $totalsectors, @parts) = @_;
 
-    $width = $w->{window}->get_allocated_width - first(get_action_box_size()) - 60 if $w->{window}->get_window;
+    if ($w->{window}->get_window) {
+	my $windowwidth = $w->{window}->get_allocated_width;
+	$windowwidth = $::real_windowwidth if $windowwidth <= 1;
+	$width = $windowwidth - first(get_action_box_size()) - 60;
+    }
 
     my $ratio = $totalsectors ? ($width - @parts * $minwidth) / $totalsectors : 1;
     my $i = 1;
@@ -352,14 +356,8 @@ sub create_buttons4partitions {
 	}
 	my $info = $entry->{mntpoint} || $entry->{device_LABEL} || '';
 	$info .= "\n" . ($entry->{size} ? formatXiB($entry->{size}, 512) : N("Unknown")) if $info;
-	my $w;
-	if ($::isInstall) {
-	    $w = Gtk3::ToggleButton->new();
-	}else {
-	    $w = Gtk3::ToggleButton->new_with_label($info);
-	    $w->get_child->set_ellipsize('end');
-	}
-	$w or internal_error('new_with_label');
+	my $w = Gtk3::ToggleButton->new_with_label($info) or internal_error('new_with_label');
+	$w->get_child->set_ellipsize('end');
 	$w->set_tooltip_text($info);
 	$w->signal_connect(clicked => sub { 
 	    $current_button != $w or return;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 35199b2cb..acb489b38 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,18 @@
+Version 16.26.1 - 20 January 2014
+
+- partitioning:
+  o increase back minimum partition width for Oxygen (mga#11977)
+
+Version 16.26 - 20 January 2014
+
+- fix detecting if basesystem is installed (mga#10722)
+  thus fixing "basesystem package not selected"
+- partitioning:
+  o fix sizing partition widgets
+  o fix not moving window (mga#11790, mga#11988, mga#11977)
+  o revert minimum partition width to its pre-gtk3 value
+  o show labels on partition buttons
+
 Version 16.25 - 19 January 2014
 
 - add Mageia 4 desktop images
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 661f3d4a8..13661efb1 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -200,7 +200,8 @@ sub choosePackages {
     log::l("rpmsrate_flags_chosen's: ", join(' ', sort @flags));
 
     #- check pre-condition that basesystem package must be selected.
-    install::pkgs::packageByName($o->{packages}, 'basesystem')->flag_available or die "basesystem package not selected";
+    my $base_pkg = install::pkgs::packageByName($o->{packages}, 'basesystem');
+    $base_pkg->flag_available or $base_pkg->flag_installed or die "basesystem package not selected";
 
     #- check if there are packages that need installation.
     $o->{steps}{installPackages}{done} = 0 if $o->{steps}{installPackages}{done} && install::pkgs::packagesToInstall($o->{packages}) > 0;
diff --git a/perl-install/mygtk3.pm b/perl-install/mygtk3.pm
index f9c614198..c9e987a1d 100644
--- a/perl-install/mygtk3.pm
+++ b/perl-install/mygtk3.pm
@@ -1333,12 +1333,12 @@ sub _create_Window {
 	my ($wi, $he);
 	$w->signal_connect(size_allocate => sub {
 	    my (undef, $event) = @_;
-	    my @w_size = @$event{qw(height width)};
+	    my @w_size = @$event{qw(width height)};
 
 	    # ignore bogus sizing events:
-	    return if $w_size[2] < 5;
-	    return if $w_size[2] == $wi && $w_size[3] == $he; #BUG
-	    (undef, undef, $wi, $he) = @w_size;
+	    return if $w_size[0] < 5;
+	    return if $w_size[0] == $wi && $w_size[1] == $he;
+	    ($wi, $he) = @w_size;
 
             $w->move(max(0, $::rootwidth - ($::o->{windowwidth} + $wi) / 2), 
 		     max(0, ($::o->{windowheight} - $he) / 2));