summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-06-30 18:43:16 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-06-30 18:43:35 +0200
commit22cbea04d59796977a865cfee7f8428e1abf09da (patch)
tree4ba4a8b77e468a1fb303c6da1726150ef73b66a0
parent293a7498b3d4e653a60c3ea8138692540396a2b9 (diff)
downloaddrakx-22cbea04d59796977a865cfee7f8428e1abf09da.tar
drakx-22cbea04d59796977a865cfee7f8428e1abf09da.tar.gz
drakx-22cbea04d59796977a865cfee7f8428e1abf09da.tar.bz2
drakx-22cbea04d59796977a865cfee7f8428e1abf09da.tar.xz
drakx-22cbea04d59796977a865cfee7f8428e1abf09da.zip
2.19
-rw-r--r--mdk-stage1/Makefile2
-rw-r--r--mdk-stage1/NEWS1
-rw-r--r--perl-install/interactive/gtk.pm3
3 files changed, 5 insertions, 1 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 4c7ab9508..dc5f5f216 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -13,7 +13,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-VERSION=2.18
+VERSION=2.19
PRODUCT=drakx-installer-binaries
#
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index 7533c890c..e24d81e07 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,4 @@
+2.19
- recognize some missing wireless drivers (mga#16768)
2.18
diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm
index c37143fc3..56c8a358b 100644
--- a/perl-install/interactive/gtk.pm
+++ b/perl-install/interactive/gtk.pm
@@ -435,6 +435,7 @@ sub create_widget {
$w->signal_connect(key_press_event => $e->{may_go_to_next});
$set = sub { $adj->set_value($_[0]) };
} elsif ($e->{type} eq 'expander') {
+ # FIXME: we handle advanced here:
$e->{grow} = 'fill';
my $children = [ if_($e->{message}, { type => 'only_label', no_indent => 1, val => \$e->{message} }), @{$e->{children}} ];
create_widgets_block($o, $common, $children, $update, $ignore_ref);
@@ -668,6 +669,7 @@ sub create_widgets_block {
my $eater = if_($e->{alignment} eq 'right' && !$label_w, gtknew('Label'));
+ # FIXME: we should not pack advanced button here
$e->{real_w} = gtkpack_(Gtk3::HBox->new,
if_($e->{icon}, 0, eval { gtkcreate_img($e->{icon}) }),
if_($eater, 1, $eater),
@@ -862,6 +864,7 @@ sub ask_fromW {
[ gtknew('Install_Button', text => N("Help"),
clicked => sub { display_help($o, $common) }), undef, 1 ]),
if_($common->{more_buttons}, @{$common->{more_buttons}}),
+ # FIXME: we should pack advanced button here
);
my $buttons_pack = ($common->{ok} || !exists $common->{ok}) && $mainw->create_okcancel($common->{ok}, $common->{cancel}, '', @more_buttons);