switch from inline gtk2-perl to gtk2-perl-xs

1 files changed, 17 insertions, 14 deletions

diff --git a/menus_launcher.pl b/menus_launcher.pl
index 9c6782bb..b46047f3 100755
--- a/menus_launcher.pl
+++ b/menus_launcher.pl
@@ -9,6 +9,11 @@ use ugtk2 qw(:helpers :wrappers);
 use interactive;
 use standalone;
 
+sub gtkcan_default {
+    $_[0]->can_default($_->[1]);
+    $_[0];
+}
+
 my $bindir = "/usr/bin/";
 my $my_win = ugtk2->new('print_launcher');
 $my_win->{rwindow}->set_title(N("Menu Configuration Center")) unless $::isEmbedded;
@@ -16,17 +21,10 @@ $my_win->{window}->signal_connect(delete_event => sub {
     gtkset_mousecursor_normal();
     ugtk2->exit(0);
 });
-my $vbox = Gtk2::VBox->new(0, 0);
-$my_win->{window}->add($vbox);
-$vbox->pack_start(Gtk2::Label->new(N("Menu Configuration Center") . N("\n\nChoose which menu you want to configure")), 0, 0, 5);
-$vbox->pack_start(Gtk2::HSeparator->new, 0, 0, 5);
 my $table = Gtk2::Table->new(3, 2, 0);
 $table->set_border_width(5);
 $table->set_row_spacings(5);
 $table->set_col_spacings(5);
-my $hbox = Gtk2::HBox->new(0, 0);
-$vbox->pack_start($hbox, 1, 1, 1);
-$hbox->pack_start($table, 0, 0, 5);
 $table->attach(Gtk2::Label->new(N("System menu")), 0, 1, 0, 1, 'fill', 'fill', 0, 0);
 my $b1 = gtksignal_connect(Gtk2::Button->new(N("Configure...")), clicked => sub { system("$bindir/menudrake --systemmenu &") });
 $table->attach($b1, 1, 2, 0, 1, 'fill', 'fill', 0, 0);
@@ -38,13 +36,18 @@ $table->attach($combo, 2, 3, 1, 2, 'fill', 'fill', 0, 0);
 my $b2 = gtksignal_connect(Gtk2::Button->new(N("Configure...")),
                   clicked => sub { my $a = $combo->entry->get_text(); system($a eq "root" ? "$bindir/menudrake --usermenu &" : " su $a -c \"$bindir/menudrake\" &") });
 $table->attach($b2, 1, 2, 1, 2, 'fill', 'fill', 0, 0);
-$vbox->pack_start(Gtk2::HSeparator->new, 0, 0, 5);
-my $bbox = Gtk2::HButtonBox->new;
-$vbox->pack_start($bbox, 0, 0, 5);
-$bbox->set_layout('end');
-my $button_ok = gtksignal_connect(Gtk2::Button->new(N("Done")), clicked => sub { ugtk2->exit(0) });
-$button_ok->can_default(1);
-$bbox->add($button_ok);
+
+$my_win->{window}->add(gtkpack(Gtk2::VBox->new(0, 0),
+                               Gtk2::Label->new(N("Menu Configuration Center") . N("\n\nChoose which menu you want to configure")),
+                               Gtk2::HSeparator->new,
+                               $table,
+                               Gtk2::HSeparator->new,
+                               gtkpack(gtkset_layout(Gtk2::HButtonBox->new, 'end'),
+                                       gtkcan_default(gtksignal_connect(Gtk2::Button->new(N("Done")), clicked => sub { ugtk2->exit(0) }), 1)
+                                      ),
+                              ),
+                      );
+
 
 $my_win->{window}->show_all;
 $my_win->main;