From b2cd4d7c3e240b2ef55ed60884cbcc84f22e29dc Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Tue, 12 Nov 2013 04:00:16 +0100
Subject: simplify: just use tooltips for service descriptions

---
 perl-install/services.pm | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/services.pm b/perl-install/services.pm
index a32e38d7c..7805f0141 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -224,18 +224,6 @@ sub ask_standalone_gtk {
     ugtk3->import(qw(:wrappers :create));
 
     my $W = ugtk3->new(N("Services"));
-    my ($x, $y, $w_popup) = (0, 0);
-    my $nopop = sub { $w_popup and $w_popup->destroy; undef $w_popup };
-    my $display = sub { 
-	my ($text) = @_;
-	$nopop->(); 
-	gtkshow(gtkadd($w_popup = Gtk3::Window->new('popup'),
-		       gtksignal_connect(gtkadd(Gtk3::EventBox->new,
-						gtkadd(gtkset_shadow_type(Gtk3::Frame->new, 'etched_out'),
-						       gtkset_justify(Gtk3::Label->new($text), 'left'))),
-					 button_press_event => sub { $nopop->() }
-					)))->move($x, $y) if $text;
-    };
     my $update_service = sub {
 	my ($service, $label) = @_;
 	my $started = is_service_running($service);
@@ -253,9 +241,8 @@ sub ask_standalone_gtk {
                 $infos ||= N("No additional information\nabout this service, sorry.");
 		my $label = gtkset_justify(Gtk3::Label->new, 'left');
                 $update_service->($service, $label) if !$is_xinetd_service;
-		[ gtkpack__(Gtk3::HBox->new(0,0), $_),
+		[ gtkpack__(Gtk3::HBox->new(0,0), gtkset_tip(Gtk3::Label->new($_), $infos)),
 		  gtkpack__(Gtk3::HBox->new(0,0), $label),
-		  gtkpack__(Gtk3::HBox->new(0,0), gtksignal_connect(Gtk3::Button->new(N("Info")), clicked => sub { $display->($infos) })),
 
                   gtkpack__(Gtk3::HBox->new(0,0), gtkset_active(gtksignal_connect(
                           Gtk3::CheckButton->new($is_xinetd_service ? N("Start when requested") : N("On boot")),
@@ -274,7 +261,6 @@ sub ask_standalone_gtk {
 			      local $_ = `GP_LANG="UTF-8" service $service $action 2>&1`; s/\033\[[^mG]*[mG]//g;
 			      c::set_tagged_utf8($_);
 			      $update_service->($service, $label);
-			      $display->($_);
 			  })) if !$is_xinetd_service;
 		  } (N_("Start"), N_("Stop"))
 		];
@@ -283,10 +269,6 @@ sub ask_standalone_gtk {
             0, gtkpack(gtkset_border_width(Gtk3::HBox->new(0,0),5), $W->create_okcancel)
             ))
 	  );
-    $b->signal_connect(motion_notify_event => sub { my ($w, $e) = @_;
-						    my ($ox, $oy) = $w->get_window->get_origin;
-						    $x = $e->x+$ox; $y = $e->y+$oy });
-    $b->signal_connect(button_press_event => sub { $nopop->() });
     $::isEmbedded and gtkflush();
     $W->main or return;
     $on_services;
-- 
cgit v1.2.1