--- textw/timezone_text.py | 108 ++--------------------------------------------- 1 files changed, 5 insertions(+), 103 deletions(-) diff --git a/textw/timezone_text.py b/textw/timezone_text.py index f12ea78..801ab6d 100644 --- a/textw/timezone_text.py +++ b/textw/timezone_text.py @@ -17,116 +17,18 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # - -import sys -import string -import iutil -from time import * -from snack import * -from constants_text import * from bootloader import hasWindows - from constants import * -import gettext -_ = lambda x: gettext.ldgettext("anaconda", x) - -sys.path.append("/usr/share/system-config-date") +from constants_text import * class TimezoneWindow: - - def getTimezoneList(self): - import zonetab - - zt = zonetab.ZoneTab() - zoneList = [ x.tz for x in zt.getEntries() ] - zoneList.sort() - return zoneList - - def updateSysClock(self): - args = ["--hctosys"] - if self.c.selected(): - args.append("--utc") - - iutil.execWithRedirect("hwclock", args, searchPath=1) - self.g.setTimer(500) - self.updateClock() - - def updateClock(self): - # disable for now - return - -# if os.access("/usr/share/zoneinfo/" + self.l.current(), os.R_OK): -# os.environ['TZ'] = self.l.current() -# self.label.setText(self.currentTime()) -# else: -# self.label.setText("") - - def currentTime(self): - return "Current time: " + strftime("%X %Z", localtime(time())) - def __call__(self, screen, anaconda): - timezones = self.getTimezoneList() - (default, asUtc) = anaconda.id.timezone.getTimezoneInfo() + (default, asUtc) = anaconda.id.timezone.getTimezoneInfo() if not default: - default = anaconda.id.instLanguage.getDefaultTimeZone() - - bb = ButtonBar(screen, [TEXT_OK_BUTTON, TEXT_BACK_BUTTON]) - t = TextboxReflowed(30, - _("In which time zone are you located?")) + default = anaconda.id.instLanguage.getDefaultTimeZone() if not anaconda.isKickstart and not hasWindows(anaconda.id.bootloader): asUtc = True -# -# disabling this for now -# -# self.label = Label(self.currentTime()) - - self.l = Listbox(5, scroll = 1, returnExit = 0) - - for tz in timezones: - self.l.append(gettext.ldgettext("system-config-date", tz), tz) - - self.l.setCurrent(default.replace("_", " ")) -# self.l.setCallback(self.updateClock) - - self.c = Checkbox(_("System clock uses UTC"), isOn = asUtc) -# self.c.setCallback(self.updateSysClock) - - self.g = GridFormHelp(screen, _("Time Zone Selection"), "timezone", - 1, 5) - self.g.add(t, 0, 0) -# self.g.add(self.label, 0, 1, padding = (0, 1, 0, 0), anchorLeft = 1) - self.g.add(self.c, 0, 2, padding = (0, 1, 0, 1), anchorLeft = 1) - self.g.add(self.l, 0, 3, padding = (0, 0, 0, 1)) - self.g.add(bb, 0, 4, growx = 1) - -# disabling for now -# self.updateClock() -# self.updateSysClock() -# -# self.g.setTimer(500) -# -# result = "TIMER" -# while result == "TIMER": -# result = self.g.run() -# if result == "TIMER": -# self.updateClock() - - result = "" - while 1: - result = self.g.run() - rc = bb.buttonPressed (result) - - if rc == TEXT_BACK_CHECK: - screen.popWindow() - return INSTALL_BACK - else: - break - - screen.popWindow() - anaconda.id.timezone.setTimezoneInfo(self.l.current().replace(" ", "_"), asUtc = self.c.selected()) - - return INSTALL_OK - - + anaconda.id.timezone.setTimezoneInfo(default, asUtc=asUtc) + return INSTALL_OK -- 1.6.0.3 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list
