summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Fulbright <msf@redhat.com>2003-09-17 20:55:03 +0000
committerMike Fulbright <msf@redhat.com>2003-09-17 20:55:03 +0000
commit8307d33391423f13c1deed409b80d8e381582a93 (patch)
treef9166970bd7d0694367ea7f66572d9949b02af1b
parent114ca03be7dab9ce579531a318be02ea7562fb84 (diff)
downloadanaconda-8307d33391423f13c1deed409b80d8e381582a93.tar.gz
anaconda-8307d33391423f13c1deed409b80d8e381582a93.tar.xz
anaconda-8307d33391423f13c1deed409b80d8e381582a93.zip
add a nag to let user know running w/o a firewall is dangerous (unlike scissors) and add mnenomics to monitor not set nag dialogbefore-taroon-merge
-rw-r--r--iw/firewall_gui.py9
-rw-r--r--iw/xconfig_gui.py4
-rw-r--r--textw/firewall_text.py13
3 files changed, 20 insertions, 6 deletions
diff --git a/iw/firewall_gui.py b/iw/firewall_gui.py
index ed0c05bcc..91b4a65b4 100644
--- a/iw/firewall_gui.py
+++ b/iw/firewall_gui.py
@@ -1,7 +1,7 @@
#
# firewall_gui.py: firewall setup screen
#
-# Copyright 2001-2002 Red Hat, Inc.
+# Copyright 2001-2003 Red Hat, Inc.
#
# This software may be freely redistributed under the terms of the GNU
# library public license.
@@ -29,6 +29,13 @@ class FirewallWindow (InstallWindow):
def getNext (self):
if self.disabled_radio.get_active ():
self.firewall.enabled = 0
+
+ rc2 = self.intf.messageWindow(_("Warning - No Firewall"),
+ _("You have elected to disable the firewall on this system. This is not recomended if this system is attached directly to the Internet or is on a large public network. A firewall will help prevent unauthorized access to your system.\n\nAre you sure you want to turn off the firewall?"),
+ type="custom", custom_icon="warning",
+ custom_buttons=[_("_Back"), _("_Proceed")])
+ if rc2 == 0:
+ raise gui.StayOnScreen
else:
self.firewall.enabled = 1
diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py
index 34ad27cf6..47e713e97 100644
--- a/iw/xconfig_gui.py
+++ b/iw/xconfig_gui.py
@@ -441,8 +441,8 @@ class MonitorWindow (InstallWindow):
"model in order to have the highest possible "
"display quality."),
type="custom",
- custom_buttons = [_("Proceed"),
- _("Choose monitor type")],
+ custom_buttons = [_("_Proceed"),
+ _("_Choose monitor type")],
custom_icon="warning")
if rc:
raise gui.StayOnScreen
diff --git a/textw/firewall_text.py b/textw/firewall_text.py
index 2d3cb2e9c..1ef241621 100644
--- a/textw/firewall_text.py
+++ b/textw/firewall_text.py
@@ -3,7 +3,7 @@
#
# Bill Nottingham <notting@redhat.com>
#
-# Copyright 2001-2002 Red Hat, Inc.
+# Copyright 2001-2003 Red Hat, Inc.
#
# This software may be freely redistributed under the terms of the GNU
# library public license.
@@ -189,8 +189,15 @@ class FirewallWindow:
screen.popWindow()
if rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK:
-
- break
+ if self.disabled.selected():
+ rc2 = self.intf.messageWindow(_("Warning - No Firewall"),
+ _("You have elected to disable the firewall on this system. This is not recomended if this system is attached directly to the Internet or is on a large public network. A firewall will help prevent unauthorized access to your system.\n\nAre you sure you want to turn off the firewall?"),
+ type="custom", custom_icon="warning",
+ custom_buttons=[_("_Back"), _("_Proceed")])
+ if rc2 == 0:
+ continue
+ else:
+ break
screen.popWindow()