--- system-config-date-1.7.15/src/timezone_gui.py~ 2005-04-01 15:16:17.271989192 +1000 +++ system-config-date-1.7.15/src/timezone_gui.py 2005-04-01 15:16:22.171244392 +1000 @@ -54,9 +54,9 @@ class timezonePage (gtk.VBox): self.utcCheck = self.xml.get_widget ("utc_check") if self.asUTC == "true": - self.utcCheck.set_active(gtk.TRUE) + self.utcCheck.set_active(True) else: - self.utcCheck.set_active(gtk.FALSE) + self.utcCheck.set_active(False) def getVBox(self): return self.mainVBox --- system-config-date-1.7.15/src/mainWindow.py~ 2005-04-01 15:16:25.654714824 +1000 +++ system-config-date-1.7.15/src/mainWindow.py 2005-04-01 15:16:29.741093600 +1000 @@ -76,7 +76,7 @@ class mainWindow: sysTime = self.datePage.getTime() ntpEnabled = self.datePage.getNtpEnabled() - if ntpEnabled == gtk.FALSE: + if ntpEnabled == False: #We're not using ntp, so stop the service self.dateBackend.stopNtpService() #set the time on the system according to what the user set it to @@ -85,7 +85,7 @@ class mainWindow: self.closeParent = 1 self.dateBackend.chkconfigOff() - elif ntpEnabled == gtk.TRUE: + elif ntpEnabled == True: #We want to use NTP ntpServers = self.datePage.getNtpServers () ntpServerChoices = self.datePage.getNtpServerChoices () @@ -147,7 +147,7 @@ class mainWindow: dlg.vbox.set_spacing(5) dlg.vbox.add(label) dlg.set_position (gtk.WIN_POS_CENTER_ON_PARENT) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.connect ('response', self.response_cb, pid) dlg.show_all() @@ -212,7 +212,7 @@ class mainWindow: #-----------Main Window-----------# self.win = self.xml.get_widget ("window") - self.win.set_property ("no_show_all", gtk.TRUE) + self.win.set_property ("no_show_all", True) self.win.connect ('destroy', self.destroy) self.vbox = self.xml.get_widget ("main_vbox") @@ -226,7 +226,7 @@ class mainWindow: if widget: pageno = self.nb.page_num (widget) self.nb.remove_page (pageno) - self.nb.set_property ("no_show_all", gtk.TRUE) + self.nb.set_property ("no_show_all", True) self.datePage = date_gui.datePage (self.dateBackend, self.xml) self.timezonePage = timezone_gui.timezonePage (self.xml) @@ -279,7 +279,7 @@ class mainWindow: dlg.set_default_size(100, 100) dlg.set_position (gtk.WIN_POS_CENTER_ON_PARENT) dlg.set_border_width(2) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) rc = dlg.run() dlg.destroy() return --- system-config-date-1.7.15/src/date_gui.py~ 2005-04-01 15:16:34.827320376 +1000 +++ system-config-date-1.7.15/src/date_gui.py 2005-04-01 15:16:37.967842944 +1000 @@ -43,7 +43,7 @@ class datePage: self.ntpServerChoices = self.dateBackend.readServerChoicesFile () - self.flag = gtk.FALSE + self.flag = False times = mainWindow.dateBackend.getDate() self.date_frame = self.xml.get_widget ("date_frame") @@ -119,15 +119,15 @@ class datePage: self.ntpCheckButton.connect("clicked", self.ntpCheckButtonClicked) self.ntpSrvAddButton.connect ("clicked", self.ntpSrvAddButtonClicked) - self.ntpSrvAddButton.set_sensitive (gtk.FALSE) + self.ntpSrvAddButton.set_sensitive (False) self.ntpSrvPropButton.connect ("clicked", self.ntpSrvAddButtonClicked) self.ntpSrvDelButton.connect ("clicked", self.ntpSrvDelButtonClicked) - self.ntpSrvDelButton.set_sensitive (gtk.FALSE) + self.ntpSrvDelButton.set_sensitive (False) #Find out if ntpd is currently running. If so, activate checkbox ntpStatus = mainWindow.dateBackend.isNtpRunning() if ntpStatus == 1: - self.ntpCheckButton.set_active(gtk.TRUE) + self.ntpCheckButton.set_active(True) elif ntpStatus == None: text = (_("The NTP initscript (%s) does not seem to be functioning " "properly. Try running 'rpm -V ntp' to see if the initscript " @@ -139,7 +139,7 @@ class datePage: dlg.set_default_size(100, 100) dlg.set_position (gtk.WIN_POS_CENTER_ON_PARENT) dlg.set_border_width(2) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) rc = dlg.run() dlg.destroy() @@ -211,7 +211,7 @@ class datePage: return self.cal.get_date() def getTime(self): - if self.flag == gtk.TRUE: + if self.flag == True: hour = self.hourEntry.get_text() min = self.minEntry.get_text() sec = self.secEntry.get_text() @@ -273,11 +273,11 @@ class datePage: def ntpServersTreeViewSelectRow (self, *args): store, iter = self.ntpServersTreeView.get_selection ().get_selected () if iter: - self.ntpSrvPropButton.set_sensitive (gtk.TRUE) - self.ntpSrvDelButton.set_sensitive (gtk.TRUE) + self.ntpSrvPropButton.set_sensitive (True) + self.ntpSrvDelButton.set_sensitive (True) else: - self.ntpSrvPropButton.set_sensitive (gtk.FALSE) - self.ntpSrvDelButton.set_sensitive (gtk.FALSE) + self.ntpSrvPropButton.set_sensitive (False) + self.ntpSrvDelButton.set_sensitive (False) def ntpSrvAddButtonClicked (self, args): host = self.ntpComboEntry.get_text () @@ -300,7 +300,7 @@ class datePage: self.ntpServers.remove (host) def changed(self, *args): - self.flag = gtk.TRUE + self.flag = True def getVBox(self): return self.mainVBox --- system-config-date-1.7.15/src/Clock.py~ 2005-04-01 15:16:42.968082792 +1000 +++ system-config-date-1.7.15/src/Clock.py 2005-04-01 15:16:46.030617216 +1000 @@ -28,11 +28,11 @@ class Clock (gtk.HBox): self.minute = gtk.Label("") self.second = gtk.Label("") - self.pack_start(self.hour, gtk.FALSE) - self.pack_start(gtk.Label(":"), gtk.FALSE) - self.pack_start(self.minute, gtk.FALSE) - self.pack_start(gtk.Label(":"), gtk.FALSE) - self.pack_start(self.second, gtk.FALSE) + self.pack_start(self.hour, False) + self.pack_start(gtk.Label(":"), False) + self.pack_start(self.minute, False) + self.pack_start(gtk.Label(":"), False) + self.pack_start(self.second, False) times = time.localtime(time.time()) self.setTime(times[3], times[4], times[5]) @@ -40,7 +40,7 @@ class Clock (gtk.HBox): def updateTime(self): times = time.localtime(time.time()) self.setTime(times[3], times[4], times[5]) - return gtk.TRUE + return True def setTime(self, hour, minute, second): if hour < 10: --- system-config-date-1.7.15/src/timezone_map_gui.py~ 2005-04-01 15:16:50.998861928 +1000 +++ system-config-date-1.7.15/src/timezone_map_gui.py 2005-04-01 15:16:54.098390728 +1000 @@ -44,7 +44,7 @@ class TimezoneMap(gtk.VBox): def __init__(self, zonetab, default="America/New_York", map='../pixmaps/map480.png'): - gtk.VBox.__init__(self, gtk.FALSE, 5) + gtk.VBox.__init__(self, False, 5) # set up class member objects self.zonetab = zonetab @@ -61,7 +61,7 @@ class TimezoneMap(gtk.VBox): x1, y1, x2, y2 = root.get_bounds() self.canvas.set_scroll_region(x1, y1, x2, y2) self.canvas.set_size_request(int(x2), int(y2)) - self.pack_start(self.canvas, gtk.FALSE, gtk.FALSE) + self.pack_start(self.canvas, False, False) self.current = root.add(gnome.canvas.CanvasText, text='x', fill_color='red', anchor=gtk.ANCHOR_CENTER, @@ -73,8 +73,8 @@ class TimezoneMap(gtk.VBox): self.arrow = root.add(gnome.canvas.CanvasLine, fill_color='limegreen', width_pixels=2, - first_arrowhead=gtk.FALSE, - last_arrowhead=gtk.TRUE, + first_arrowhead=False, + last_arrowhead=True, arrow_shape_a=4.0, arrow_shape_b=8.0, arrow_shape_c=4.0, @@ -83,9 +83,9 @@ class TimezoneMap(gtk.VBox): # set up status bar self.status = gtk.Statusbar() - self.status.set_has_resize_grip(gtk.FALSE) + self.status.set_has_resize_grip(False) self.statusContext = self.status.get_context_id("") - self.pack_start(self.status, gtk.FALSE, gtk.FALSE) + self.pack_start(self.status, False, False) self.columns = Enum("TZ", "COMMENTS", "ENTRY") @@ -125,7 +125,7 @@ class TimezoneMap(gtk.VBox): self.listView = gtk.TreeView(self.listStore) selection = self.listView.get_selection() selection.connect("changed", self.selectionChanged) - self.listView.set_property("headers-visible", gtk.FALSE) + self.listView.set_property("headers-visible", False) col = gtk.TreeViewColumn(None, gtk.CellRendererText(), text=0) self.listView.append_column(col) col = gtk.TreeViewColumn(None, gtk.CellRendererText(), text=1) @@ -134,7 +134,7 @@ class TimezoneMap(gtk.VBox): sw = gtk.ScrolledWindow () sw.add(self.listView) sw.set_shadow_type(gtk.SHADOW_IN) - self.pack_start(sw, gtk.TRUE, gtk.TRUE) + self.pack_start(sw, True, True) self.setCurrent(self.currentEntry) @@ -193,8 +193,8 @@ class TimezoneMap(gtk.VBox): selection.select_iter(iter) path = self.listStore.get_path(iter) col = self.listView.get_column(0) - self.listView.set_cursor(path, col, gtk.FALSE) - self.listView.scroll_to_cell(path, col, gtk.TRUE, 0.5, 0.5) + self.listView.set_cursor(path, col, False) + self.listView.scroll_to_cell(path, col, True, 0.5, 0.5) break iter = self.listStore.iter_next(iter) @@ -231,7 +231,7 @@ if __name__ == "__main__": button.connect("pressed", gtk.main_quit) else: button.connect("pressed", gtk.mainquit) - vbox.pack_start(button, gtk.FALSE, gtk.FALSE) + vbox.pack_start(button, False, False) win.add(vbox) win.show_all() if gtk.__dict__.has_key ("main"):