From efd48a0739ee16e455e131d4173446dc483c8ccb Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 22 May 2003 21:51:01 +0000 Subject: - simplify gui construction through create_packtable(), we really do not have to offuscate it like c programmers have to - one shall not be able to alter kernel or distribution release number --- perl-install/standalone/drakbug | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index 94131c6b9..5db066b0b 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -71,23 +71,13 @@ push(@generic_tool,@all_drakxtools); my $kernel_release = chomp_(`uname -r`) . ""; -my $table = new Gtk2::Table(4,2, 'TRUE'); -#$table->set_border_width(5); -$table->set_row_spacings(10); -$table->set_col_spacings(5); -$table->attach(new Gtk2::Label(N("Application:")), 0, 1, 0, 1, 'fill', 'fill',20,0); -$table->attach(new Gtk2::Label(N("Package: ")), 0, 1, 1, 2, 'fill', 'fill',0,0); -$table->attach(new Gtk2::Label(N("Kernel:")), 0, 1, 2, 3, 'fill', 'fill',0,0); -$table->attach(new Gtk2::Label(N("Release: ")), 0, 1, 3, 4, 'fill', 'fill',0,0); -$table->attach(my $comb_app = new Gtk2::Combo(), 1, 2, 0, 1, 'fill', 'fill',0,0); -$comb_app->set_size_request(270, undef); +my $table = create_packtable({ col_spacings => 5, row_spacings => 10 }, + [ new Gtk2::Label(N("Application:")), my $comb_app = gtkset_size_request(Gtk2::Combo->new(), 270, -1) ], + [ new Gtk2::Label(N("Package: ")), my $package = new Gtk2::Entry("...") ], + [ Gtk2::Label->new(N("Kernel:")), my $kernel_rel = gtkset_editable(Gtk2::Entry->new($kernel_release), 0) ], + [ Gtk2::Label->new(N("Release: ")), my $mdk_rel = gtkset_editable(Gtk2::Entry->new(mandrake_release()), 0) ] + ); $comb_app->set_popdown_strings("", sort(@generic_tool)); -$table->attach(my $package = new Gtk2::Entry(), 1, 2, 1, 2, 'fill', 'fill',0,0); -$package->set_text("..."); -$table->attach(my $kernel_rel = new Gtk2::Entry(), 1, 2, 2, 3, 'fill', 'fill',0,0); -$kernel_rel->set_text($kernel_release); -$table->attach(my $mdk_rel = new Gtk2::Entry(), 1, 2, 3, 4, 'fill', 'fill',0,0); -$mdk_rel->set_text(mandrake_release()); gtkpack2__( gtkpack2__(my $vbx = new Gtk2::VBox(0,5), -- cgit v1.2.1