From 8fadbcbceabe95733503a7c119424621eb680a0f Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Fri, 23 Feb 2001 15:26:57 +0000
Subject: new wizard layout, no use gtk in draknet, minor bugfixes

---
 perl-install/my_gtk.pm          | 9 +++------
 perl-install/network.pm         | 2 +-
 perl-install/standalone/draknet | 2 --
 3 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index a387c83a8..0570e3d81 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -56,14 +56,11 @@ sub new {
 	    $::WizardTable = new Gtk::Table(2, 2, 0);
 	    $::WizardWindow->add($::WizardTable);
 	    my $draw1 = new Gtk::DrawingArea;
-	    $draw1->set_usize(50,50);
+	    $draw1->set_usize(400,100);
 	    my $draw2 = new Gtk::DrawingArea;
-	    $draw1->set_usize(50,50);
-	    my $draw3 = new Gtk::DrawingArea;
-	    $draw1->set_usize(50,50);
-	    $::WizardTable->attach($draw1, 0, 1, 0, 1, 'fill', 'fill', 0, 0);
+	    $draw2->set_usize(100,200);
+	    $::WizardTable->attach($draw1, 0, 2, 0, 1, 'fill', 'fill', 0, 0);
 	    $::WizardTable->attach($draw2, 0, 1, 1, 2, 'fill', 'fill', 0, 0);
-	    $::WizardTable->attach($draw3, 1, 2, 0, 1, 'fill', 'fill', 0, 0);
 	    $::WizardWindow->show_all;
 	    flush();
 	}
diff --git a/perl-install/network.pm b/perl-install/network.pm
index 2700b8f1e..7f094f02a 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -318,7 +318,7 @@ notation (for example, 1.2.3.4).");
     my @fields = qw(IPADDR NETMASK);
     $::isStandalone or $in->set_help('configureNetworkIP');
     $in->ask_from_entries_refH(_("Configuring network device %s", $intf->{DEVICE}),
-			      ($::isStandalone ? '' : _("Configuring network device %s", $intf->{DEVICE}) . ( $module ? _(" (driver $module)") : '' ) ."\n\n") .
+			      (_("Configuring network device %s", $intf->{DEVICE}) . ( $module ? _(" (driver $module)") : '' ) ."\n\n") .
 			      $text,
 			     [ { label => _("IP address"), val => \$intf->{IPADDR} }, 
 			       { label => _("Netmask"),     val => \$intf->{NETMASK} },
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 01bc99771..ef38e221b 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -18,8 +18,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-use Gtk;
-init Gtk;
 use Data::Dumper;
 use lib qw(/usr/lib/libDrakX);
 #use lib qw(..);
-- 
cgit v1.2.1