--- firstboot-1.3.39/src/firstbootWindow.py~ 2005-04-01 15:26:35.068069912 +1000 +++ firstboot-1.3.39/src/firstbootWindow.py 2005-04-01 15:26:38.825498696 +1000 @@ -56,7 +56,7 @@ class firstbootWindow: self.doDebug = doDebug self.lowRes = lowRes self.autoscreenshot = autoscreenshot - self.mainHBox = gtk.HBox(gtk.FALSE, 10) + self.mainHBox = gtk.HBox(False, 10) self.leftLabelVBox = gtk.VBox() self.leftLabelVBox.set_border_width(12) @@ -66,7 +66,7 @@ class firstbootWindow: leftEventBox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#7e8ea0")) self.leftVBox = gtk.VBox() - self.leftVBox.pack_start(leftEventBox, gtk.TRUE) + self.leftVBox.pack_start(leftEventBox, True) self.moduleList = [] self.moduleDict = {} @@ -83,7 +83,7 @@ class firstbootWindow: mainVBox = gtk.VBox() #This isn't debug mode, so jump through some hoops to go into fullscreen/root window mode - self.win.set_decorated(gtk.FALSE) + self.win.set_decorated(False) x_screen = gtk.gdk.screen_width() y_screen = gtk.gdk.screen_height() @@ -96,8 +96,8 @@ class firstbootWindow: ## gc = bgimage.new_gc() ## pixbuf.render_to_drawable(bgimage, gc, 0, 0, 0, 0, x_screen, ## y_screen, gtk.gdk.RGB_DITHER_MAX, 0, 0) -## self.win.set_app_paintable(gtk.TRUE) -## self.win.window.set_back_pixmap(bgimage, gtk.FALSE) +## self.win.set_app_paintable(True) +## self.win.window.set_back_pixmap(bgimage, False) ## if not self.doDebug: ## self.win.set_size_request(x_screen, y_screen) @@ -110,8 +110,8 @@ class firstbootWindow: gc = bgimage.new_gc() pixbuf.render_to_drawable(bgimage, gc, 0, 0, 0, 0, x_screen, y_screen, gtk.gdk.RGB_DITHER_MAX, 0, 0) - self.win.set_app_paintable(gtk.TRUE) - self.win.window.set_back_pixmap(bgimage, gtk.FALSE) + self.win.set_app_paintable(True) + self.win.window.set_back_pixmap(bgimage, False) if not self.doDebug: self.win.set_size_request(x_screen, y_screen) @@ -140,15 +140,15 @@ class firstbootWindow: #self.modulePath = ('/usr/src/rhn/up2date/firstboot') self.modulePath = ('/usr/share/firstboot/modules') self.win.set_position(gtk.WIN_POS_CENTER) - self.notebook.set_show_tabs(gtk.FALSE) - self.notebook.set_scrollable(gtk.TRUE) - self.notebook.set_show_border(gtk.FALSE) + self.notebook.set_show_tabs(False) + self.notebook.set_scrollable(True) + self.notebook.set_show_border(False) else: self.modulePath = ('/usr/share/firstboot/modules') self.win.set_position(gtk.WIN_POS_CENTER) self.win.window.property_change ("_NET_WM_WINDOW_TYPE", "ATOM", 32, gtk.gdk.PROP_MODE_REPLACE, ("_NET_WM_WINDOW_TYPE_DESKTOP",)) - self.notebook.set_show_tabs(gtk.FALSE) - self.notebook.set_show_border(gtk.FALSE) + self.notebook.set_show_tabs(False) + self.notebook.set_show_border(False) self.notebook.connect("switch-page", self.switchPage) @@ -161,12 +161,12 @@ class firstbootWindow: if not self.lowRes: # Add the box on the left to the window's HBox. - self.mainHBox.pack_start(self.leftVBox, gtk.FALSE) + self.mainHBox.pack_start(self.leftVBox, False) # Populate the right side of the window. Add the notebook to a VBox. self.internalVBox = gtk.VBox() - self.internalVBox.pack_start(self.notebook, gtk.TRUE) + self.internalVBox.pack_start(self.notebook, True) # Now add the EventBox to the right-side VBox. self.rightVBox = gtk.VBox() @@ -178,7 +178,7 @@ class firstbootWindow: alignment = gtk.Alignment() alignment.add(self.rightVBox) alignment.set(0.2, 0.3, 0.8, 0.8) - self.mainHBox.pack_start(alignment, gtk.TRUE) + self.mainHBox.pack_start(alignment, True) else: self.mainHBox.pack_start(self.rightVBox) @@ -190,22 +190,22 @@ class firstbootWindow: self.backButton = gtk.Button(stock='gtk-go-back') label = self.backButton.get_children()[0].get_children()[0].get_children()[1] label.set_text(_("_Back")) - label.set_property("use_underline", gtk.TRUE) + label.set_property("use_underline", True) self.backButton.connect('clicked', self.backClicked) - self.backButton.set_sensitive(gtk.FALSE) + self.backButton.set_sensitive(False) self.bb.pack_start(self.backButton) # Create the "go forward" button. self.nextButton = gtk.Button(stock='gtk-go-forward') label = self.nextButton.get_children()[0].get_children()[0].get_children()[1] label.set_text(_("_Next")) - label.set_property("use_underline", gtk.TRUE) + label.set_property("use_underline", True) self.nextHandler = self.nextButton.connect('clicked', self.nextClicked) self.bb.pack_start(self.nextButton) # Add the button box to the bottom of the box which contains the notebook. - self.internalVBox.pack_start(self.bb, gtk.FALSE) + self.internalVBox.pack_start(self.bb, False) # Add the main HBox to a VBox which will sit in the window. mainVBox.pack_start(self.mainHBox) @@ -331,7 +331,7 @@ class firstbootWindow: self.win.disconnect(self.winHandler) self.winHandler = self.win.connect ("key-release-event", self.closeRelease) - self.backButton.set_sensitive(gtk.TRUE) + self.backButton.set_sensitive(True) def backClicked(self, *args): # print "back: %s" % self.pageHistory @@ -345,7 +345,7 @@ class firstbootWindow: self.setPointer(self.notebook.get_current_page()) if self.notebook.get_current_page() == 0: - self.backButton.set_sensitive(gtk.FALSE) + self.backButton.set_sensitive(False) self.nextButton.disconnect(self.nextHandler) self.nextHandler = self.nextButton.connect('clicked', self.nextClicked) @@ -382,8 +382,8 @@ class firstbootWindow: bgimage = gtk.gdk.Pixmap(eb.window, 800, 600, -1) gc = bgimage.new_gc() pixbuf.render_to_drawable(bgimage, gc, 0, 0, 0, 0, 800, 600, gtk.gdk.RGB_DITHER_MAX, 0, 0) - eb.set_app_paintable(gtk.TRUE) - eb.window.set_back_pixmap(bgimage, gtk.FALSE) + eb.set_app_paintable(True) + eb.window.set_back_pixmap(bgimage, False) def checkNetwork(self): # see if we have a non loopback interface up @@ -474,7 +474,7 @@ class firstbootWindow: ## leftEventBox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("#7e8ea0")) ## self.leftVBox = gtk.VBox() -## self.leftVBox.pack_start(leftEventBox, gtk.TRUE) +## self.leftVBox.pack_start(leftEventBox, True) # Add the modules to the proper lists. pages = 0 @@ -519,11 +519,11 @@ class firstbootWindow: titleBox = gtk.HBox() if pix: - titleBox.pack_start(pix, gtk.FALSE) - titleBox.pack_start(title_label, gtk.TRUE) + titleBox.pack_start(pix, False) + titleBox.pack_start(title_label, True) titleBox.set_spacing(8) - vbox.pack_start(titleBox, gtk.FALSE) + vbox.pack_start(titleBox, False) vbox.reorder_child(titleBox, 0) if self.lowRes: @@ -536,15 +536,15 @@ class firstbootWindow: # jump around self.moduleNameToNotebookIndex[module.__module__] = pages self.notebook.append_page(vbox, gtk.Label(_(module.moduleName))) - hbox = gtk.HBox(gtk.FALSE, 5) + hbox = gtk.HBox(False, 5) pix = functions.imageFromFile("pointer-blank.png") label = gtk.Label("") label.set_markup("%s" % (_(module.moduleName))) label.set_alignment(0.0, 0.5) - hbox.pack_start(pix, gtk.FALSE) + hbox.pack_start(pix, False) - hbox.pack_end(label, gtk.TRUE) - self.leftLabelVBox.pack_start(hbox, gtk.FALSE, gtk.TRUE, 3) + hbox.pack_end(label, True) + self.leftLabelVBox.pack_start(hbox, False, True, 3) else: self.notebook.append_page(vbox, gtk.Label(" ")) self.moduleNameToNotebookIndex["unamemodule-%s" % pages] = pages @@ -578,11 +578,11 @@ class firstbootWindow: # Change the locale on the buttons. label = self.backButton.get_children()[0].get_children()[0].get_children()[1] label.set_text(_("_Back")) - label.set_property("use_underline", gtk.TRUE) + label.set_property("use_underline", True) label = self.nextButton.get_children()[0].get_children()[0].get_children()[1] label.set_text(_("_Next")) - label.set_property("use_underline", gtk.TRUE) + label.set_property("use_underline", True) self.clearNotebook() self.loadModules() @@ -611,7 +611,7 @@ class firstbootWindow: src_x = (screen_width - 800) / 2 src_y = (screen_height - 600) / 2 - screenshot = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, gtk.FALSE, 8, + screenshot = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, 8, 800, 600) screenshot.get_from_drawable(gtk.gdk.get_default_root_window(), --- firstboot-1.3.39/src/modules/create_user.py~ 2005-04-01 15:26:49.541869560 +1000 +++ firstboot-1.3.39/src/modules/create_user.py 2005-04-01 15:26:54.830065632 +1000 @@ -54,9 +54,9 @@ class childWindow: self.usernameEntry = gtk.Entry() self.fullnameEntry = gtk.Entry() self.passwordEntry = gtk.Entry() - self.passwordEntry.set_visibility(gtk.FALSE) + self.passwordEntry.set_visibility(False) self.confirmEntry = gtk.Entry() - self.confirmEntry.set_visibility(gtk.FALSE) + self.confirmEntry.set_visibility(False) self.vbox = gtk.VBox() self.vbox.set_size_request(400, 200) @@ -71,53 +71,53 @@ class childWindow: "(non-administrative) use of your system. To create a system 'username,' " "please provide the information requested below.")) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_alignment(0.0, 0.5) label.set_size_request(500, -1) internalVBox.pack_start(label, FALSE, TRUE) table = gtk.Table(2, 4) label = gtk.Label(_("_Username:")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) label.set_mnemonic_widget(self.usernameEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 0, 1, gtk.FILL) table.attach(self.usernameEntry, 1, 2, 0, 1, gtk.SHRINK, gtk.FILL, 5, 5) label = gtk.Label(_("Full Nam_e:")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) label.set_mnemonic_widget(self.fullnameEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 1, 2, gtk.FILL) table.attach(self.fullnameEntry, 1, 2, 1, 2, gtk.SHRINK, gtk.FILL, 5, 5) label = gtk.Label(_("_Password:")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) label.set_mnemonic_widget(self.passwordEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 2, 3, gtk.FILL) table.attach(self.passwordEntry, 1, 2, 2, 3, gtk.SHRINK, gtk.FILL, 5, 5) label = gtk.Label(_("Confir_m Password:")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) label.set_mnemonic_widget(self.confirmEntry) label.set_alignment(0.0, 0.5) table.attach(label, 0, 1, 3, 4, gtk.FILL) table.attach(self.confirmEntry, 1, 2, 3, 4, gtk.SHRINK, gtk.FILL, 5, 5) - internalVBox.pack_start(table, gtk.TRUE, 15) + internalVBox.pack_start(table, True, 15) # internalVBox.pack_start(gtk.HSeparator()) align = gtk.Alignment() align.set(0.9, 0.5, 0.0, 1.0) align.set_size_request(-1, 30) - internalVBox.pack_start(align, gtk.FALSE) + internalVBox.pack_start(align, False) label = gtk.Label(_("If you need to use network authentication such as Kerberos or NIS, " "please click the Use Network Login button.")) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_alignment(0.0, 0.5) label.set_size_request(500, -1) internalVBox.pack_start(label, FALSE, TRUE) @@ -129,10 +129,10 @@ class childWindow: align = gtk.Alignment() align.add(authButton) align.set(0.9, 0.5, 0.0, 1.0) - authHBox.pack_start(align, gtk.TRUE) - internalVBox.pack_start(authHBox, gtk.TRUE, gtk.TRUE) + authHBox.pack_start(align, True) + internalVBox.pack_start(authHBox, True, True) - self.vbox.pack_start(internalVBox, gtk.FALSE, 15) + self.vbox.pack_start(internalVBox, False, 15) # users = self.admin.enumerateUsersFull() # self.normalUsersList = [] @@ -166,7 +166,7 @@ class childWindow: "for administrative use only."))) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.add_button(_("_Continue"), 0) b = dlg.add_button(_("Create _account"), 1) @@ -268,7 +268,7 @@ class childWindow: def showErrorMessage(self, text): dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, text) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) rc = dlg.run() dlg.destroy() return None --- firstboot-1.3.39/src/modules/soundcard_gui.py~ 2005-04-01 15:27:05.338468112 +1000 +++ firstboot-1.3.39/src/modules/soundcard_gui.py 2005-04-01 15:27:08.939920608 +1000 @@ -63,7 +63,7 @@ class SoundWindow: #Add icon to the top frame self.icon = functions.imageFromFile("multimedia.png") - internalVBox = gtk.VBox(gtk.FALSE, 10) + internalVBox = gtk.VBox(False, 10) internalVBox.set_border_width(10) @@ -72,23 +72,23 @@ class SoundWindow: "hear a series of three sounds. The first sound will be in the " "right channel, the second sound will be in the left channel, " "and the third sound will be in the center.")) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_size_request(500, -1) label.set_alignment(0.0, 0.5) messageLabel = gtk.Label(_(self.shortMessage)) - messageLabel.set_line_wrap(gtk.TRUE) + messageLabel.set_line_wrap(True) messageLabel.set_size_request(500, -1) messageLabel.set_alignment(0.0, 0.5) - self.mainVBox.pack_start(internalVBox, gtk.FALSE) - internalVBox.pack_start(messageLabel, gtk.FALSE) - internalVBox.pack_start(label, gtk.FALSE) + self.mainVBox.pack_start(internalVBox, False) + internalVBox.pack_start(messageLabel, False) + internalVBox.pack_start(label, False) hbox = gtk.HBox() - hbox.pack_start(self.soundcardBox, gtk.FALSE) + hbox.pack_start(self.soundcardBox, False) - internalVBox.pack_start(hbox, gtk.FALSE) + internalVBox.pack_start(hbox, False) return self.mainVBox, self.icon, self.windowTitle --- firstboot-1.3.39/src/modules/display.py~ 2005-04-01 15:27:14.357097072 +1000 +++ firstboot-1.3.39/src/modules/display.py 2005-04-01 15:27:20.584150416 +1000 @@ -65,16 +65,16 @@ class DisplayWindow(FirstbootGuiWindow): self.icon = functions.imageFromPath("/usr/share/system-config-display/pixmaps/system-config-display.png") self.mainVBox = gtk.VBox() - internalVBox = gtk.VBox(gtk.FALSE, 10) + internalVBox = gtk.VBox(False, 10) internalVBox.set_border_width(10) messageLabel = gtk.Label(_(self.shortMessage)) - messageLabel.set_line_wrap(gtk.TRUE) + messageLabel.set_line_wrap(True) messageLabel.set_size_request(500, -1) messageLabel.set_alignment(0.0, 0.5) - internalVBox.pack_start(vbox, gtk.TRUE) - self.mainVBox.pack_start(internalVBox, gtk.TRUE) + internalVBox.pack_start(vbox, True) + self.mainVBox.pack_start(internalVBox, True) def launch(self, doDebug=None): self.doDebug = doDebug --- firstboot-1.3.39/src/modules/additional_cds.py~ 2005-04-01 15:27:24.737519008 +1000 +++ firstboot-1.3.39/src/modules/additional_cds.py 2005-04-01 15:27:28.143001296 +1000 @@ -126,8 +126,8 @@ class childWindow: # table.attach(button, 2, 3, 3, 4, gtk.SHRINK, gtk.SHRINK) - internalVBox.pack_start(table, gtk.FALSE, padding=20) - self.vbox.pack_start(internalVBox, gtk.TRUE) + internalVBox.pack_start(table, False, padding=20) + self.vbox.pack_start(internalVBox, True) return self.vbox, title_pix, self.moduleName @@ -158,7 +158,7 @@ class childWindow: (_("A CD-ROM has not been detected. Please insert " "a CD-ROM in the drive and click \"OK\" to continue."))) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) cancelButton = dlg.add_button('gtk-cancel', 0) okButton = dlg.add_button('gtk-ok', 1) rc = dlg.run() @@ -192,7 +192,7 @@ class childWindow: (_("The autorun program cannot be found on the cd. " "Click \"OK\" to continue."))) dlg.set_position(gtk.WIN_POS_CENTER) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) okButton = dlg.add_button('gtk-ok', 0) rc = dlg.run() dlg.destroy() --- firstboot-1.3.39/src/modules/networking.py~ 2005-04-01 15:27:32.647316536 +1000 +++ firstboot-1.3.39/src/modules/networking.py 2005-04-01 15:27:35.995807488 +1000 @@ -52,9 +52,9 @@ class childWindow: self.usernameEntry = gtk.Entry() self.fullnameEntry = gtk.Entry() self.passwordEntry = gtk.Entry() - self.passwordEntry.set_visibility(gtk.FALSE) + self.passwordEntry.set_visibility(False) self.confirmEntry = gtk.Entry() - self.confirmEntry.set_visibility(gtk.FALSE) + self.confirmEntry.set_visibility(False) self.vbox = gtk.VBox() self.vbox.set_size_request(400, 200) @@ -67,7 +67,7 @@ class childWindow: label = gtk.Label(_("The following network devices have been detected on the system:")) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_alignment(0.0, 0.5) label.set_size_request(500, -1) internalVBox.pack_start(label, FALSE, TRUE) @@ -82,14 +82,14 @@ class childWindow: self.deviceSW.add(self.deviceView) self.deviceBox = gtk.HBox() - self.deviceBox.pack_start(self.deviceSW, gtk.TRUE) + self.deviceBox.pack_start(self.deviceSW, True) col = gtk.TreeViewColumn(_("Network Device"), gtk.CellRendererText(), text = 0) self.deviceView.append_column(col) col = gtk.TreeViewColumn(_("Boot protocol"), gtk.CellRendererText(), text = 1) self.deviceView.append_column(col) - internalVBox.pack_start(self.deviceBox, gtk.FALSE) + internalVBox.pack_start(self.deviceBox, False) self.updateLabels() networkButton = gtk.Button(_("_Change Network Configuration...")) @@ -99,9 +99,9 @@ class childWindow: align.add(networkButton) align.set(1.0, 0.5, 0.1, 1.0) - internalVBox.pack_start(align, gtk.FALSE) + internalVBox.pack_start(align, False) - self.vbox.pack_start(internalVBox, gtk.FALSE, 15) + self.vbox.pack_start(internalVBox, False, 15) users = self.admin.enumerateUsersFull() self.normalUsersList = [] --- firstboot-1.3.39/src/modules/date.py~ 2005-04-01 15:27:41.559961608 +1000 +++ firstboot-1.3.39/src/modules/date.py 2005-04-01 15:27:44.681487064 +1000 @@ -60,17 +60,17 @@ class TimeWindow(FirstbootGuiWindow): self.icon = functions.imageFromPath("/usr/share/system-config-date/pixmaps/system-config-date.png") self.mainVBox = gtk.VBox() - internalVBox = gtk.VBox(gtk.FALSE, 10) + internalVBox = gtk.VBox(False, 10) internalVBox.set_border_width(10) messageLabel = gtk.Label(_(self.shortMessage)) - messageLabel.set_line_wrap(gtk.TRUE) + messageLabel.set_line_wrap(True) messageLabel.set_size_request(500, -1) messageLabel.set_alignment(0.0, 0.5) - internalVBox.pack_start(messageLabel, gtk.FALSE) - internalVBox.pack_start(self.datePageNotebook, gtk.TRUE) - self.mainVBox.pack_start(internalVBox, gtk.TRUE) + internalVBox.pack_start(messageLabel, False) + internalVBox.pack_start(self.datePageNotebook, True) + self.mainVBox.pack_start(internalVBox, True) def launch(self, doDebug=None): self.doDebug = doDebug --- firstboot-1.3.39/src/modules/finished.py~ 2005-04-01 15:27:49.121812032 +1000 +++ firstboot-1.3.39/src/modules/finished.py 2005-04-01 15:27:52.389315296 +1000 @@ -36,14 +36,14 @@ class childWindow: self.post_txt = _("Please click the \"Next\" button in the lower right corner to continue.") self.label = gtk.Label(self.txt) - self.label.set_line_wrap(gtk.TRUE) + self.label.set_line_wrap(True) self.label.set_alignment(0.0, 0.5) self.label.set_size_request(500, -1) internalVBox.pack_start(self.label, FALSE, TRUE) - self.vbox.pack_start(internalVBox, gtk.FALSE, 5) + self.vbox.pack_start(internalVBox, False, 5) pix = functions.ditheredImageFromFile("splash-small.png") - self.vbox.pack_start(pix, gtk.TRUE, gtk.TRUE, 5) + self.vbox.pack_start(pix, True, True, 5) return self.vbox, title_pix, self.moduleName --- firstboot-1.3.39/src/modules/timezone.py~ 2005-04-01 15:27:56.826640720 +1000 +++ firstboot-1.3.39/src/modules/timezone.py 2005-04-01 15:28:20.519038928 +1000 @@ -61,17 +61,17 @@ class TimeWindow(FirstbootGuiWindow): self.icon = functions.imageFromPath("/usr/share/system-config-date/pixmaps/system-config-date.png") self.mainVBox = gtk.VBox() - internalVBox = gtk.VBox(gtk.FALSE, 10) + internalVBox = gtk.VBox(False, 10) internalVBox.set_border_width(10) messageLabel = gtk.Label(_(self.shortMessage)) - messageLabel.set_line_wrap(gtk.TRUE) + messageLabel.set_line_wrap(True) messageLabel.set_size_request(500, -1) messageLabel.set_alignment(0.0, 0.5) - internalVBox.pack_start(messageLabel, gtk.FALSE) - internalVBox.pack_start(self.timezoneWidget, gtk.TRUE) - self.mainVBox.pack_start(internalVBox, gtk.TRUE) + internalVBox.pack_start(messageLabel, False) + internalVBox.pack_start(self.timezoneWidget, True) + self.mainVBox.pack_start(internalVBox, True) def launch(self, doDebug=None): self.doDebug = doDebug --- firstboot-1.3.39/src/modules/welcome.py~ 2005-04-01 15:28:25.717248680 +1000 +++ firstboot-1.3.39/src/modules/welcome.py 2005-04-01 15:28:28.969754224 +1000 @@ -36,14 +36,14 @@ class childWindow: "will now guide you through some basic configuration. Please click the " "\"Next\" button in the lower right corner to continue.")) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_alignment(0.0, 0.5) label.set_size_request(500, -1) internalVBox.pack_start(label, FALSE, TRUE) - self.vbox.pack_start(internalVBox, gtk.FALSE, 5) + self.vbox.pack_start(internalVBox, False, 5) pix = functions.ditheredImageFromFile("splash-small.png") - self.vbox.pack_start(pix, gtk.TRUE, gtk.TRUE, 5) + self.vbox.pack_start(pix, True, True, 5) return self.vbox, title_pix, msg --- firstboot-1.3.39/src/exceptionWindow.py~ 2005-04-01 15:28:39.827103656 +1000 +++ firstboot-1.3.39/src/exceptionWindow.py 2005-04-01 15:28:42.709665440 +1000 @@ -41,7 +41,7 @@ class ExceptionWindow: text_scroll.set_shadow_type(gtk.SHADOW_ETCHED_IN) text_view = gtk.TextView() - text_view.set_editable(gtk.FALSE) + text_view.set_editable(False) text_buf = gtk.TextBuffer(None) text_scroll.add(text_view) @@ -64,8 +64,8 @@ class ExceptionWindow: text_buf.set_text(text) text_view.set_buffer(text_buf) - win.vbox.pack_start(label, gtk.FALSE) - win.vbox.pack_start(text_scroll, gtk.TRUE) + win.vbox.pack_start(label, False) + win.vbox.pack_start(text_scroll, True) try: fd = open(path, "w") --- firstboot-1.3.39/src/unused-modules/hardware.py~ 2005-04-01 15:28:49.123690360 +1000 +++ firstboot-1.3.39/src/unused-modules/hardware.py 2005-04-01 15:28:52.254214448 +1000 @@ -41,7 +41,7 @@ class childWindow: pix = functions.imageFromFile("hwbrowser.png") if pix: - titleBox.pack_start(pix, gtk.FALSE, gtk.TRUE, 5) + titleBox.pack_start(pix, False, True, 5) titleBox.pack_start(label) --- firstboot-1.3.39/src/unused-modules/networking.py~ 2005-04-01 15:28:57.849363856 +1000 +++ firstboot-1.3.39/src/unused-modules/networking.py 2005-04-01 15:29:01.166859520 +1000 @@ -51,16 +51,16 @@ class childWindow: if p: pix = gtk.Image() pix.set_from_pixbuf(p) - titleBox.pack_start(pix, gtk.FALSE, gtk.TRUE, 5) + titleBox.pack_start(pix, False, True, 5) titleBox.pack_start(title) eventBox = gtk.EventBox() eventBox.add(titleBox) eventBox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse ("#cc0000")) - self.mainVBox.pack_start(eventBox, gtk.FALSE) + self.mainVBox.pack_start(eventBox, False) - internalVBox = gtk.VBox(gtk.FALSE, 10) + internalVBox = gtk.VBox(False, 10) internalVBox.set_border_width(10) label = gtk.Label(_("A network connection was not detected. Network connectivity " @@ -68,12 +68,12 @@ class childWindow: "the Red Hat Update Agent to update your system. " "To set up a network connection, please click on the button below.\n")) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_size_request(500, -1) label.set_alignment(0.0, 0.5) - self.mainVBox.pack_start(internalVBox, gtk.FALSE) - internalVBox.pack_start(label, gtk.FALSE, gtk.TRUE) + self.mainVBox.pack_start(internalVBox, False) + internalVBox.pack_start(label, False, True) internalVBox.pack_start(self.page1()) @@ -98,9 +98,9 @@ class childWindow: def networkAvailable(self): try: gethostbyname(gethostname()) - return gtk.TRUE + return True except: - return gtk.FALSE + return False def write_file(self): pass @@ -117,14 +117,14 @@ class childWindow: # bb.set_spacing(10) self.yesButton = gtk.Button(_("Set up networking...")) self.yesButton.connect("clicked", self.setupNetwork) - bb.pack_start(self.yesButton, gtk.FALSE) + bb.pack_start(self.yesButton, False) a = gtk.Alignment() a.add(bb) a.set(0.1, 0.0, 0.1, 1.0) box = gtk.VBox() -# box.pack_start(label, gtk.FALSE, gtk.TRUE) - box.pack_start(a, gtk.FALSE) +# box.pack_start(label, False, True) + box.pack_start(a, False) return box def page2(self): @@ -137,14 +137,14 @@ class childWindow: align.add(notebook) internalVBox = gtk.VBox() - internalVBox.pack_start(align, gtk.FALSE, gtk.FALSE) + internalVBox.pack_start(align, False, False) align = gtk.Alignment(0.0, 0.5, 0.6, 1.0) align.add(gtk.HSeparator()) - internalVBox.pack_start(align, gtk.FALSE, gtk.FALSE, 10) + internalVBox.pack_start(align, False, False, 10) internalVBox.set_border_width(10) - box.pack_start(internalVBox, gtk.FALSE) + box.pack_start(internalVBox, False) @@ -154,7 +154,7 @@ class childWindow: DHCPcb = gtk.CheckButton(_("Configure using DHCP")) align.add(DHCPcb) - devbox.pack_start(align, gtk.FALSE) + devbox.pack_start(align, False) align = gtk.Alignment() bootcb = gtk.CheckButton(("Activate on boot")) @@ -164,9 +164,9 @@ class childWindow: # or onboot == "yes") align.add(bootcb) - devbox.pack_start(align, gtk.FALSE) + devbox.pack_start(align, False) - devbox.pack_start(gtk.HSeparator(), gtk.FALSE, padding=3) + devbox.pack_start(gtk.HSeparator(), False, padding=3) options = [(_("IP Address"), "ipaddr"), (_("Netmask"), "netmask"), @@ -217,7 +217,7 @@ class childWindow: ## options[2].connect("focus_out_event", self.focusOutNW, devs[i]) ## options[3].connect("focus_out_event", self.focusOutBC, devs[i]) - devbox.pack_start(ipTable, gtk.FALSE, gtk.FALSE, 5) + devbox.pack_start(ipTable, False, False, 5) devbox.show_all() notebook.append_page(devbox, gtk.Label(dev)) @@ -225,7 +225,7 @@ class childWindow: # a = GtkAlignment() # a.add(GtkHSeparator()) # a.set(0.0, 0.0, 0.5, 0.5) -# box.pack_start(a, gtk.FALSE, padding=10) +# box.pack_start(a, False, padding=10) options = [(_("Hostname")), (_("Gateway")), (_("Primary DNS")), @@ -264,7 +264,7 @@ class childWindow: self.ns3 = options[4] # self.ns3.set_text(self.network.ternaryNS) - box.pack_start(self.ipTable, gtk.FALSE, gtk.FALSE, 5) + box.pack_start(self.ipTable, False, False, 5) return box