add mouse test in non-embedded mode (#2049)

2 files changed, 20 insertions, 1 deletions

diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index e4e364187..c1b430eca 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -1,7 +1,7 @@
 Summary: The drakxtools (XFdrake, diskdrake, keyboarddrake, mousedrake...)
 Name:    drakxtools
 Version: 9.2
-Release: 0.5mdk
+Release: 0.6mdk
 Url: http://www.mandrakelinux.com/en/drakx.php2
 Source0: %name-%version.tar.bz2
 License: GPL
@@ -312,6 +312,9 @@ file /etc/sysconfig/harddrake2/previous_hw | fgrep -q perl && %_datadir/harddrak
 %config(noreplace) %_sysconfdir/logrotate.d/drakxtools-http
 
 %changelog
+* Fri May 30 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 9.2-0.6mdk
+- mousedrake: add mouse test in non-embedded mode (#2049)
+
 * Tue May 27 2003 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.2-0.5mdk
 - keyboardrake: resync with XFree86-4.3 (pablo)
 
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index e6048a173..a774eeb9f 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -63,6 +63,22 @@ if (!$mouse || !$::auto) {
 }
 
 mouse::write_conf($in, $mouse, 1);
+
+if (!$::isEmbedded && $in->isa('interactive::gtk')) {
+    require ugtk2;
+    ugtk2->import(qw(:wrappers :create));
+    my $w = ugtk2->new(N("Mouse test"));
+    gtkadd($w->{window},
+           gtkpack(Gtk2::VBox->new(0, 5),
+                   Gtk2::Label->new(N("Please test your mouse:")),
+                   my $test_hbox = Gtk2::HBox->new(0, 5),
+                   gtkpack(create_hbox(),
+                           gtksignal_connect(Gtk2::Button->new(N("Ok")),     clicked => sub { $w->{retval} = 1; Gtk2->main_quit }),
+                           gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { $w->{retval} = 0; Gtk2->main_quit }))));
+    mouse::test_mouse_standalone($mouse, $test_hbox);
+    $w->main or goto begin;
+}
+
 system('service', 'gpm', 'restart') if -e '/var/lock/subsys/gpm';
 
 $in->exit(0);