summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-04-08 05:33:14 +0000
committerdamien <damien@mandriva.com>2001-04-08 05:33:14 +0000
commit8893a1832ef6845da2d19d05d2c63d163aa4aafc (patch)
tree32261f89214581b70f4b208723dfa78ea42961a2
parent5e8ab79263d7731b4f9fff88e466755ecf569950 (diff)
downloaddrakx-backup-do-not-use-8893a1832ef6845da2d19d05d2c63d163aa4aafc.tar
drakx-backup-do-not-use-8893a1832ef6845da2d19d05d2c63d163aa4aafc.tar.gz
drakx-backup-do-not-use-8893a1832ef6845da2d19d05d2c63d163aa4aafc.tar.bz2
drakx-backup-do-not-use-8893a1832ef6845da2d19d05d2c63d163aa4aafc.tar.xz
drakx-backup-do-not-use-8893a1832ef6845da2d19d05d2c63d163aa4aafc.zip
updated
-rw-r--r--perl-install/my_gtk.pm8
-rwxr-xr-xperl-install/standalone/drakgw4
-rwxr-xr-xperl-install/standalone/draknet2
-rwxr-xr-xperl-install/standalone/tinyfirewall1
-rw-r--r--perl-install/tinyfirewall.pm2
5 files changed, 15 insertions, 2 deletions
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 8a9f47303..e84c5a0a4 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -63,12 +63,20 @@ sub new {
my ($y1, $x1) = $im_up->get_size;
# my ($im_left, $mask_left) = gtkcreate_png($::Wizard_pix_left || "wiz_default_left.png");
# my ($y2, $x2) = $im_left->get_size;
+ my $style= new Gtk::Style;
+ $style->font(Gtk::Gdk::Font->fontset_load("-adobe-times-bold-r-normal-*-24-*-75-75-p-*-iso8859-*"));
+ my $w = $style->font->string_width($::Wizard_title);
$draw1->signal_connect(expose_event => sub {
my $i;
for ($i=0;$i<(540/$y1);$i++) {
$draw1->window->draw_pixmap ($draw1->style->bg_gc('normal'),
$im_up, 0, 0, 0, $y1*$i,
$x1 , $y1 );
+ $draw1->window->draw_string(
+ $style->font,
+ $draw1->style->white_gc,
+ 140+(380-$w)/2, 62,
+ ($::Wizard_title) );
}
});
# $draw2->signal_connect(expose_event => sub {
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 81841214c..dff50ebf9 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -34,6 +34,7 @@ local $_ = join '', @ARGV;
/-version/ and die 'version: $Id$ '."\n";
$::isEmbedded or $::isWizard = 1;
$::Wizard_pix_up = "wiz_drakgw.png";
+$::Wizard_title = "Internet Connection Sharing";
$::direct = /-direct/;
@@ -640,6 +641,9 @@ Click on Configure to launch the setup wizard.", $setup_state));
#-------------------------------------------------
#- $Log$
+#- Revision 1.35 2001/04/08 05:33:14 damien
+#- updated
+#-
#- Revision 1.34 2001/04/06 15:09:15 yduret
#- swap cancel/configure button
#-
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 9df97ae3a..e7b45801f 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -30,7 +30,7 @@ $::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
$::isWizard = "@ARGV" =~ /--wizard/;
$::isEmbedded or $::isWizard=1;
$::Wizard_pix_up = "wiz_draknet.png";
-
+$::Wizard_title = "Network & Internet Configuration";
local $_ = join '', @ARGV;
#/-h/ and die "usage: draknet[--xf3] [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n";
diff --git a/perl-install/standalone/tinyfirewall b/perl-install/standalone/tinyfirewall
index 5350ecfa3..a5cafc5ac 100755
--- a/perl-install/standalone/tinyfirewall
+++ b/perl-install/standalone/tinyfirewall
@@ -26,6 +26,7 @@ use tinyfirewall;
$::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/;
$::isWizard = "@ARGV" =~ /--wizard/;
$::Wizard_pix_up = "wiz_firewall.png";
+$::Wizard_title = "Firewalling Configuration";
local $_ = join '', @ARGV;
diff --git a/perl-install/tinyfirewall.pm b/perl-install/tinyfirewall.pm
index 51a24d01d..2045c3993 100644
--- a/perl-install/tinyfirewall.pm
+++ b/perl-install/tinyfirewall.pm
@@ -133,7 +133,7 @@ my $popimap = sub {
my $quit = sub {
$_[0] or $in->exit(0);
SaveConfig();
- $in->standalone::pkgs_install(Kernel22() ? "ipchains" : "iptables");
+ $in->standalone::pkgs_install(Kernel22() ? "ipchains" : "iptables", "Bastille");
system($_) foreach ("/bin/cp /usr/share/Bastille/bastille-ipchains /usr/share/Bastille/bastille-netfilter /sbin",
"/bin/cp /usr/share/Bastille/bastille-firewall /etc/rc.d/init.d/",
"/bin/chmod 0700 /etc/rc.d/init.d/bastille-firewall", "/bin/chmod 0700 /sbin/bastille-ipchains",