- move cancel button in button bar

- hide previous button when cancel one is shown
- hude button bar when embedded tool is displayed

1 files changed, 9 insertions, 3 deletions

diff --git a/control-center b/control-center
index 19515ebe..e9b27f1c 100755
--- a/control-center
+++ b/control-center
@@ -509,9 +509,6 @@ gtkadd($window_global,
                                                                                          ),
                                                                               0, Gtk2::Label->new(N("Please wait...")),
                                                                               1, Gtk2::HBox->new(0, 0),
-                                                                              0, gtkadd(gtkset_layout(gtkset_border_width(Gtk2::HButtonBox->new, 10), 'end'),
-                                                                                        gtksignal_connect(Gtk2::Button->new_from_stock(N("Cancel")), clicked => sub { Glib::Source->remove($timeout) if $timeout; kill_children(); child_just_exited() }),
-                                                                                       ),
                                                                              ),
                                                                  ),
                                                         ),
@@ -524,6 +521,11 @@ gtkadd($window_global,
                            ),
                 0, my $buttons = gtkadd(gtkset_layout(Gtk2::HButtonBox->new, 'end'),
                                         Gtk2::Label->new,
+                                        gtksignal_connect(my $cancel = Gtk2::Button->new(N("Cancel")), 
+                                                          clicked => sub { 
+                                                              Glib::Source->remove($timeout) if $timeout; kill_children(); 
+                                                              child_just_exited();
+                                                          }),
                                         gtksignal_connect(my $previous = Gtk2::Button->new(N("Previous")),
                                                           clicked => sub {
                                                               $page_id = 0;
@@ -766,6 +768,7 @@ sub create_hidden_socket() {
                                     $left_locked = 0;
                                     $emb_wait->hide;
                                     show_hide_previous(0);
+                                    $buttons->hide;
                                     return if !$emb_socket;
                                     $emb_socket->show;
                                     $emb_socket->can_focus(1);
@@ -822,6 +825,8 @@ sub compute_exec_string {
         if ($gtkplug > 0) {
             $exec .= " --embedded " . $emb_socket->get_id;
             $emb_wait->show;
+            $cancel->show;
+            $previous->hide;
             $run_pixbuf = gtkcreate_pixbuf($icon . "_128");
             $run_counter = 255;
             $run_counter_add = -10;
@@ -1039,6 +1044,7 @@ sub set_page {
 sub show_hide_previous {
     my ($bool) = @_;
     if ($bool) { $previous->show } else { $previous->hide }
+    $cancel->hide;
 }