diff options
-rwxr-xr-x | control-center | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/control-center b/control-center index 0d58c470..c3414930 100755 --- a/control-center +++ b/control-center @@ -515,7 +515,7 @@ gtkadd($window_global, 0, Gtk2::HSeparator->new, 1, my $notebook_global = gtkset_name(Gtk2::Notebook->new, 'mcc'), 1, gtkpack(my $emb_box = Gtk2::VBox->new(0, 0), - my $run_darea = Gtk2::DrawingArea->new, + my $wait_darea = Gtk2::DrawingArea->new, ), 0, Gtk2::HSeparator->new, ), @@ -677,21 +677,21 @@ foreach (keys %check_boxes) { my ($run_pixbuf, $run_counter, $run_counter_add); -$run_darea->signal_connect(expose_event => sub { - return if !$run_darea->realized; +$wait_darea->signal_connect(expose_event => sub { + return if !$wait_darea->realized; return unless $run_pixbuf; # some people got an expose event before we start an embedded tool - $run_darea->{layout} ||= $run_darea->create_pango_layout(N("Loading... Please wait")); + $wait_darea->{layout} ||= $wait_darea->create_pango_layout(N("Loading... Please wait")); my $pixbuf = render_alpha($run_pixbuf, $run_counter); - my $size = $run_darea->allocation; + my $size = $wait_darea->allocation; my ($d_width, $d_height) = ($size->width, $size->height); - my ($window, $gc, $width, $height) = ($run_darea->window, $run_darea->style->fg_gc('normal'), $pixbuf->get_width, $pixbuf->get_height); - my ($txt_width, $txt_height) = $run_darea->{layout}->get_pixel_size; + my ($window, $gc, $width, $height) = ($wait_darea->window, $wait_darea->style->fg_gc('normal'), $pixbuf->get_width, $pixbuf->get_height); + my ($txt_width, $txt_height) = $wait_darea->{layout}->get_pixel_size; my ($y_icon, $x_icon) = (($d_width - $width)/2, ($d_height - $height - $txt_height)/2); my ($y_text, $x_text) = ($y_icon, $x_icon + $width + 5); $pixbuf->render_to_drawable($window, $gc, 0, 0, $y_icon, $x_icon, $width, $height, 'normal', 0, 0); - my $style = $run_darea->{style} ||= $run_darea->get_style; - $run_darea->window->draw_layout($style->text_gc('normal'), $y_text + $width/2 - $txt_width/2, $x_text, $run_darea->{layout}); + my $style = $wait_darea->{style} ||= $wait_darea->get_style; + $wait_darea->window->draw_layout($style->text_gc('normal'), $y_text + $width/2 - $txt_width/2, $x_text, $wait_darea->{layout}); $run_counter += $run_counter_add; $run_counter_add = -$run_counter_add if $run_counter < 100 || 255-$run_counter_add < $run_counter; }); @@ -772,7 +772,7 @@ sub create_hidden_socket() { $emb_socket->signal_connect('plug-added' => sub { Glib::Source->remove($timeout) if $timeout; $left_locked = 0; - $run_darea->hide; + $wait_darea->hide; show_hide_previous(0); $buttons->hide; return if !$emb_socket; @@ -783,7 +783,7 @@ sub create_hidden_socket() { }); $emb_box->set_focus_child($emb_socket); $emb_socket->hide; - $run_darea->hide; + $wait_darea->hide; } @@ -830,26 +830,26 @@ sub compute_exec_string { $pending_app = 1; if ($gtkplug > 0) { $exec .= " --embedded " . $emb_socket->get_id; - $run_darea->show; + $wait_darea->show; $cancel->show; $previous->hide; $run_pixbuf = gtkcreate_pixbuf($icon . "_128"); $run_counter = 255; $run_counter_add = -5; - undef $run_darea->{color}; + undef $wait_darea->{color}; $timeout = Glib::Timeout->add(35, sub { - my $style = $run_darea->{style} ||= $run_darea->get_style; - my $bg = $run_darea->{bg} ||= $style->bg('normal'); - my $base = $run_darea->{base} ||= $style->base('normal'); - my $color = $run_darea->{color} ||= $base; + my $style = $wait_darea->{style} ||= $wait_darea->get_style; + my $bg = $wait_darea->{bg} ||= $style->bg('normal'); + my $base = $wait_darea->{base} ||= $style->base('normal'); + my $color = $wait_darea->{color} ||= $base; # $base -> $bg - $run_darea->window->set_background($color); - $run_darea->{color} = gtkcolor(map { $_->[0] - min(500, $_->[0] - $_->[1]) } + $wait_darea->window->set_background($color); + $wait_darea->{color} = gtkcolor(map { $_->[0] - min(500, $_->[0] - $_->[1]) } ([ $color->red, $bg->red ], [ $color->green, $bg->green ], [ $color->blue, $bg->blue ]) ); - $run_darea->queue_draw; + $wait_darea->queue_draw; 1; }); $left_locked = 1; |