diff options
| author | Peter Jones <pjones@redhat.com> | 2005-03-12 03:01:54 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2005-03-12 03:01:54 +0000 |
| commit | b6c0d8fb54f90b8bc30b3d870997385954c64164 (patch) | |
| tree | 912f3c026f2dc0b822691675d4e7e283cd745a72 /iw | |
| parent | d267b1e14b912f42007a1a7fed1eb8cd2bd6d6be (diff) | |
| download | anaconda-b6c0d8fb54f90b8bc30b3d870997385954c64164.tar.gz anaconda-b6c0d8fb54f90b8bc30b3d870997385954c64164.tar.xz anaconda-b6c0d8fb54f90b8bc30b3d870997385954c64164.zip | |
fix warnings about gtk.TRUE and gtk.FALSE, partly based on a patch
from Colin Walters.
Diffstat (limited to 'iw')
41 files changed, 643 insertions, 643 deletions
diff --git a/iw/account_gui.py b/iw/account_gui.py index 5c344995e..7d998a75e 100644 --- a/iw/account_gui.py +++ b/iw/account_gui.py @@ -88,17 +88,17 @@ class AccountWindow (InstallWindow): hbox = gtk.HBox() pix = gui.readImageFromFile ("root-password.png") if pix: - hbox.pack_start (pix, gtk.FALSE) + hbox.pack_start (pix, False) label = gui.WrappingLabel (_("The root account is used for " "administering the system. Enter " "a password for the root user.")) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_size_request(350, -1) label.set_alignment(0.0, 0.5) - hbox.pack_start(label, gtk.FALSE) + hbox.pack_start(label, False) - box.pack_start(hbox, gtk.FALSE) + box.pack_start(hbox, False) self.forward = lambda widget, box=box: box.emit('focus', gtk.DIR_TAB_FORWARD) @@ -118,23 +118,23 @@ class AccountWindow (InstallWindow): self.pw.connect ("activate", self.forward) self.pw.connect ("map-event", self.setFocus) - self.pw.set_visibility (gtk.FALSE) + self.pw.set_visibility (False) self.confirm = gtk.Entry (128) pass2.set_mnemonic_widget(self.confirm) self.confirm.connect ("activate", self.forward) - self.confirm.set_visibility (gtk.FALSE) + self.confirm.set_visibility (False) table.attach (self.pw, 1, 2, 0, 1, gtk.FILL|gtk.EXPAND, 5) table.attach (self.confirm, 1, 2, 1, 2, gtk.FILL|gtk.EXPAND, 5) hbox = gtk.HBox() - hbox.pack_start(table, gtk.FALSE) - box.pack_start (hbox, gtk.FALSE) + hbox.pack_start(table, False) + box.pack_start (hbox, False) # root password statusbar self.rootStatus = gtk.Label ("") - wrapper = gtk.HBox(0, gtk.FALSE) + wrapper = gtk.HBox(0, False) wrapper.pack_start (self.rootStatus) - box.pack_start (wrapper, gtk.FALSE) + box.pack_start (wrapper, False) pw = self.rootPw.getPure() if pw: diff --git a/iw/auth_gui.py b/iw/auth_gui.py index 3287a35a6..5635daad9 100644 --- a/iw/auth_gui.py +++ b/iw/auth_gui.py @@ -23,22 +23,22 @@ class AuthWindow (InstallWindow): def setSensitivities (self, *args): if (not self.nis.get_active()): - self.nisDomain.set_sensitive (gtk.FALSE) - self.nisBroadcast.set_sensitive (gtk.FALSE) - self.nisServer.set_sensitive (gtk.FALSE) - self.nisDomainLabel.set_sensitive (gtk.FALSE) - self.nisServerLabel.set_sensitive (gtk.FALSE) + self.nisDomain.set_sensitive (False) + self.nisBroadcast.set_sensitive (False) + self.nisServer.set_sensitive (False) + self.nisDomainLabel.set_sensitive (False) + self.nisServerLabel.set_sensitive (False) else: - self.nisDomain.set_sensitive (gtk.TRUE) - self.nisDomainLabel.set_sensitive (gtk.TRUE) - self.nisBroadcast.set_sensitive (gtk.TRUE) + self.nisDomain.set_sensitive (True) + self.nisDomainLabel.set_sensitive (True) + self.nisBroadcast.set_sensitive (True) if (self.nisBroadcast.get_active()): - self.nisServerLabel.set_sensitive (gtk.FALSE) - self.nisServer.set_sensitive (gtk.FALSE) + self.nisServerLabel.set_sensitive (False) + self.nisServer.set_sensitive (False) else: - self.nisServerLabel.set_sensitive (gtk.TRUE) - self.nisServer.set_sensitive (gtk.TRUE) + self.nisServerLabel.set_sensitive (True) + self.nisServer.set_sensitive (True) ldapactive = self.ldap.get_active() self.ldapServerLabel.set_sensitive (ldapactive) @@ -91,7 +91,7 @@ class AuthWindow (InstallWindow): def getScreen (self, auth): self.auth = auth - box = gtk.VBox (gtk.FALSE, 10) + box = gtk.VBox (False, 10) nb = gtk.Notebook () @@ -125,7 +125,7 @@ class AuthWindow (InstallWindow): a = gtk.Alignment (0, 0) a.add (self.nisBroadcast) - nistable = gtk.Table (10, 4, gtk.FALSE) + nistable = gtk.Table (10, 4, False) nistable.attach (self.nis, 0, 10, 0, 1, gtk.FILL, gtk.SHRINK, 0.0, 0.5) spacer = gtk.Label("") @@ -155,7 +155,7 @@ class AuthWindow (InstallWindow): self.ldapServer.set_text (self.auth.ldapServer) self.ldapBasedn.set_text (self.auth.ldapBasedn) - ldaptable = gtk.Table (10, 4, gtk.FALSE) + ldaptable = gtk.Table (10, 4, False) ldaptable.attach (self.ldap, 0, 10, 0, 1, gtk.FILL, gtk.SHRINK, 0.0, 0.5) @@ -194,7 +194,7 @@ class AuthWindow (InstallWindow): self.krb5Kdc.set_text (self.auth.krb5Kdc) self.krb5Admin.set_text (self.auth.krb5Admin) - krb5table = gtk.Table (10, 4, gtk.FALSE) + krb5table = gtk.Table (10, 4, False) krb5table.attach (self.krb5, 0, 10, 0, 1, gtk.FILL, gtk.SHRINK, 0.0, 0.5) @@ -228,7 +228,7 @@ class AuthWindow (InstallWindow): self.sambaServer.set_text (self.auth.sambaServer) self.sambaWorkgroup.set_text (self.auth.sambaWorkgroup) - sambatable = gtk.Table (10, 3, gtk.FALSE) + sambatable = gtk.Table (10, 3, False) sambatable.attach (self.samba, 0, 10, 0, 1, gtk.FILL, gtk.SHRINK, 0.0, 0.5) @@ -258,9 +258,9 @@ class AuthWindow (InstallWindow): nb.append_page(sambatable, sambaLabel) - box.pack_start (self.md5, gtk.FALSE) - box.pack_start (self.shadow, gtk.FALSE) - box.pack_start (nb, gtk.TRUE) + box.pack_start (self.md5, False) + box.pack_start (self.shadow, False) + box.pack_start (nb, True) box.set_border_width (5) diff --git a/iw/blpasswidget.py b/iw/blpasswidget.py index 8186c0bd1..985cf6cbf 100644 --- a/iw/blpasswidget.py +++ b/iw/blpasswidget.py @@ -32,29 +32,29 @@ class BootloaderPasswordWidget: usePass = 0 self.password = None - vbox = gtk.VBox(gtk.FALSE, 5) + vbox = gtk.VBox(False, 5) label = gui.WrappingLabel(_("A boot loader password prevents users from changing options passed to the kernel. For greater system security, it is recommended that you set a password.")) label.set_alignment(0.0, 0.5) - vbox.pack_start(label, gtk.FALSE) + vbox.pack_start(label, False) # password widgets + callback self.usePassCb = gtk.CheckButton(_("_Use a boot loader password")) self.passButton = gtk.Button("No password") if usePass: - self.usePassCb.set_active(gtk.TRUE) - self.passButton.set_sensitive(gtk.TRUE) + self.usePassCb.set_active(True) + self.passButton.set_sensitive(True) else: - self.usePassCb.set_active(gtk.FALSE) - self.passButton.set_sensitive(gtk.FALSE) + self.usePassCb.set_active(False) + self.passButton.set_sensitive(False) self.usePassCb.connect("toggled", self.passCallback) self.passButton.connect("clicked", self.passButtonCallback) self.setPassLabel() - box = gtk.HBox(gtk.FALSE, 5) + box = gtk.HBox(False, 5) box.pack_start(self.usePassCb) box.pack_start(self.passButton) - vbox.pack_start(box, gtk.FALSE) + vbox.pack_start(box, False) alignment = gtk.Alignment() alignment.set(0.1, 0, 0, 0) @@ -75,14 +75,14 @@ class BootloaderPasswordWidget: def setPassLabel(self): self.passButton.set_label(_("Change _password")) if not self.usePassCb.get_active() or not self.password: - self.passButton.set_sensitive(gtk.FALSE) + self.passButton.set_sensitive(False) else: - self.passButton.set_sensitive(gtk.TRUE) + self.passButton.set_sensitive(True) # callback for when the password checkbox is clicked def passCallback(self, widget, *args): if not widget.get_active(): - self.passButton.set_sensitive(gtk.FALSE) + self.passButton.set_sensitive(False) self.setPassLabel() else: if self.passwordWindow() == 2: @@ -112,13 +112,13 @@ class BootloaderPasswordWidget: label = gui.MnemonicLabel(_("_Password:")) table.attach(label, 0, 1, 2, 3, gtk.FILL, 0, 10) pwEntry = gtk.Entry (16) - pwEntry.set_visibility (gtk.FALSE) + pwEntry.set_visibility (False) label.set_mnemonic_widget(pwEntry) table.attach(pwEntry, 1, 2, 2, 3, gtk.FILL, 0, 10) label = gui.MnemonicLabel(_("Con_firm:")) table.attach(label, 0, 1, 3, 4, gtk.FILL, 0, 10) confirmEntry = gtk.Entry (16) - confirmEntry.set_visibility (gtk.FALSE) + confirmEntry.set_visibility (False) label.set_mnemonic_widget(confirmEntry) table.attach(confirmEntry, 1, 2, 3, 4, gtk.FILL, 0, 10) dialog.vbox.pack_start(table) diff --git a/iw/bootdisk_gui.py b/iw/bootdisk_gui.py index 83db6718f..18a25355b 100644 --- a/iw/bootdisk_gui.py +++ b/iw/bootdisk_gui.py @@ -25,7 +25,7 @@ class BootdiskWindow (InstallWindow): def __init__ (self, ics): InstallWindow.__init__ (self, ics) - ics.setPrevEnabled (gtk.FALSE) + ics.setPrevEnabled (False) def getNext (self): if iutil.getArch() == "alpha" or iutil.getArch() == "ia64": @@ -42,13 +42,13 @@ class BootdiskWindow (InstallWindow): def getScreen (self, dir, disp, fsset): self.dispatch = disp - box = gtk.VBox (gtk.FALSE, 5) + box = gtk.VBox (False, 5) pix = gui.readImageFromFile ("gnome-floppy.png") if pix: a = gtk.Alignment () a.add (pix) a.set (0.0, 0.0, 0.0, 0.0) - box.pack_start (a, gtk.FALSE) + box.pack_start (a, False) label = None @@ -62,17 +62,17 @@ class BootdiskWindow (InstallWindow): label = gtk.Label (text) - label.set_line_wrap (gtk.TRUE) - box.pack_start (label, gtk.FALSE) + label.set_line_wrap (True) + box.pack_start (label, False) - radioBox = gtk.VBox (gtk.FALSE) + radioBox = gtk.VBox (False) self.createDisk = gtk.RadioButton( None, _("_Yes, I would like to create a boot diskette")) - radioBox.pack_start(self.createDisk, gtk.FALSE, gtk.FALSE, padding=10) + radioBox.pack_start(self.createDisk, False, False, padding=10) self.skipDisk = gtk.RadioButton( self.createDisk, _("No, I _do not want to create a boot diskette")) - radioBox.pack_start(self.skipDisk, gtk.FALSE, gtk.FALSE) + radioBox.pack_start(self.skipDisk, False, False) self.createDisk.set_active(1) diff --git a/iw/bootloader_advanced_gui.py b/iw/bootloader_advanced_gui.py index 5fa73e710..e32c38db3 100644 --- a/iw/bootloader_advanced_gui.py +++ b/iw/bootloader_advanced_gui.py @@ -64,18 +64,18 @@ class AdvancedBootloaderWindow(InstallWindow): # set up the vbox with force lba32 and kernel append def setupOptionsVbox(self): - self.options_vbox = gtk.VBox(gtk.FALSE, 5) + self.options_vbox = gtk.VBox(False, 5) self.options_vbox.set_border_width(5) self.forceLBA = gtk.CheckButton(_("_Force LBA32 (not normally required)")) - self.options_vbox.pack_start(self.forceLBA, gtk.FALSE) + self.options_vbox.pack_start(self.forceLBA, False) self.forceLBA.set_active(self.bl.forceLBA32) label = gui.WrappingLabel(_("If you wish to add default options to the " "boot command, enter them into " "the 'General kernel parameters' field.")) label.set_alignment(0.0, 0.0) - self.options_vbox.pack_start(label, gtk.FALSE) + self.options_vbox.pack_start(label, False) label = gui.MnemonicLabel(_("_General kernel parameters")) self.appendEntry = gtk.Entry() @@ -83,12 +83,12 @@ class AdvancedBootloaderWindow(InstallWindow): args = self.bl.args.get() if args: self.appendEntry.set_text(args) - box = gtk.HBox(gtk.FALSE, 0) + box = gtk.HBox(False, 0) box.pack_start(label) box.pack_start(self.appendEntry) al = gtk.Alignment(0.0, 0.0) al.add(box) - self.options_vbox.pack_start(al, gtk.FALSE) + self.options_vbox.pack_start(al, False) def getScreen(self, dispatch, bl, fsset, diskset): @@ -96,18 +96,18 @@ class AdvancedBootloaderWindow(InstallWindow): self.bl = bl self.intf = dispatch.intf - thebox = gtk.VBox (gtk.FALSE, 10) + thebox = gtk.VBox (False, 10) # boot loader location bits (mbr vs boot, drive order) self.blloc = BootloaderLocationWidget(bl, fsset, diskset, self.parent, self.intf) - thebox.pack_start(self.blloc.getWidget(), gtk.FALSE) + thebox.pack_start(self.blloc.getWidget(), False) - thebox.pack_start (gtk.HSeparator(), gtk.FALSE) + thebox.pack_start (gtk.HSeparator(), False) # some optional things self.setupOptionsVbox() - thebox.pack_start(self.options_vbox, gtk.FALSE) + thebox.pack_start(self.options_vbox, False) return thebox diff --git a/iw/bootloader_main_gui.py b/iw/bootloader_main_gui.py index a80e9a62b..5d411ac8d 100644 --- a/iw/bootloader_main_gui.py +++ b/iw/bootloader_main_gui.py @@ -88,7 +88,7 @@ class MainBootloaderWindow(InstallWindow): if rc == 2: break - if self.none_radio.get_active() == gtk.TRUE: + if self.none_radio.get_active() == True: newrc = self.intf.messageWindow(_("Warning"), _("You have elected to not install any boot loader. It is strongly recommended that you install a boot loader unless you have an advanced need. A boot loader is almost always required in order to reboot your system into Linux directly from the hard drive.\n\nWould you like to continue and not install a boot loader?"), type = "custom", @@ -114,7 +114,7 @@ class MainBootloaderWindow(InstallWindow): def setupChooseBootloaderRadioBox(self): - radio_vbox = gtk.VBox(gtk.FALSE, 2) + radio_vbox = gtk.VBox(False, 2) radio_vbox.set_border_width(5) label = gui.WrappingLabel(_("Please select the boot loader that " @@ -132,14 +132,14 @@ class MainBootloaderWindow(InstallWindow): "boot loader"))) - radio_vbox.pack_start(label, gtk.FALSE) - radio_vbox.pack_start(self.grub_radio, gtk.FALSE) - radio_vbox.pack_start(self.none_radio, gtk.FALSE) + radio_vbox.pack_start(label, False) + radio_vbox.pack_start(self.grub_radio, False) + radio_vbox.pack_start(self.none_radio, False) if self.blname is None: - self.none_radio.set_active(gtk.TRUE) + self.none_radio.set_active(True) else: - self.grub_radio.set_active(gtk.TRUE) + self.grub_radio.set_active(True) return radio_vbox @@ -149,10 +149,10 @@ class MainBootloaderWindow(InstallWindow): self.bllabel.set_text(_("The %s boot loader will be " "installed on /dev/%s.") % (self.blname, self.bldev)) - active = gtk.TRUE + active = True else: self.bllabel.set_text(_("No boot loader will be installed.")) - active = gtk.FALSE + active = False for widget in [ self.oslist.getWidget(), self.blpass.getWidget(), self.advanced ]: @@ -171,10 +171,10 @@ class MainBootloaderWindow(InstallWindow): self.usePass = 0 self.password = None - thebox = gtk.VBox (gtk.FALSE, 10) + thebox = gtk.VBox (False, 10) spacer = gtk.Label("") spacer.set_size_request(10, 1) - thebox.pack_start(spacer, gtk.FALSE) + thebox.pack_start(spacer, False) if self.bl.useGrub(): self.blname = "GRUB" @@ -198,45 +198,45 @@ class MainBootloaderWindow(InstallWindow): self.bllabel.set_alignment(0.0, 0.5) - hbox = gtk.HBox(gtk.FALSE, 10) - hbox.pack_start(self.bllabel, gtk.FALSE) + hbox = gtk.HBox(False, 10) + hbox.pack_start(self.bllabel, False) button = gtk.Button(_("_Change boot loader")) - hbox.pack_start(button, gtk.FALSE) + hbox.pack_start(button, False) button.connect("clicked", self.changeBootloaderCallback) alignment = gtk.Alignment() alignment.set(0.1, 0, 0, 0) alignment.add(hbox) - thebox.pack_start(alignment, gtk.FALSE) + thebox.pack_start(alignment, False) spacer = gtk.Label("") spacer.set_size_request(10, 1) - thebox.pack_start(spacer, gtk.FALSE) + thebox.pack_start(spacer, False) # configure the systems available to boot from the boot loader self.oslist = OSBootWidget(bl, fsset, diskSet, self.parent, self.intf, self.blname) - thebox.pack_start(self.oslist.getWidget(), gtk.FALSE) + thebox.pack_start(self.oslist.getWidget(), False) - thebox.pack_start (gtk.HSeparator(), gtk.FALSE) + thebox.pack_start (gtk.HSeparator(), False) # control whether or not there's a boot loader password and what it is self.blpass = BootloaderPasswordWidget(bl, self.parent, self.intf) - thebox.pack_start(self.blpass.getWidget(), gtk.FALSE) + thebox.pack_start(self.blpass.getWidget(), False) - thebox.pack_start (gtk.HSeparator(), gtk.FALSE) + thebox.pack_start (gtk.HSeparator(), False) # check box to control showing the advanced screen self.advanced = gtk.CheckButton(_("Configure advanced boot loader " "_options")) if dispatch.stepInSkipList("bootloaderadvanced"): - self.advanced.set_active(gtk.FALSE) + self.advanced.set_active(False) else: - self.advanced.set_active(gtk.TRUE) + self.advanced.set_active(True) - thebox.pack_start(self.advanced, gtk.FALSE) + thebox.pack_start(self.advanced, False) # finally, update the label and activate widgets appropriately self.updateBootLoaderLabel() diff --git a/iw/bootlocwidget.py b/iw/bootlocwidget.py index acf85b616..31bdd634f 100644 --- a/iw/bootlocwidget.py +++ b/iw/bootlocwidget.py @@ -33,7 +33,7 @@ class BootloaderLocationWidget: self.driveOrder = bl.drivelist self.usingGrub = self.bl.useGrub() - locationBox = gtk.VBox (gtk.FALSE, 2) + locationBox = gtk.VBox (False, 2) locationBox.set_border_width(5) label = gtk.Label(_("Install Boot Loader record on:")) @@ -42,7 +42,7 @@ class BootloaderLocationWidget: spacer = gtk.Label("") spacer.set_size_request(10, 1) - locationBox.pack_start(spacer, gtk.FALSE) + locationBox.pack_start(spacer, False) choices = fsset.bootloaderChoices(diskset, self.bl) self.bootDevices = {} @@ -55,20 +55,20 @@ class BootloaderLocationWidget: (device, desc) = choices[key] radio = gtk.RadioButton(radio, ("/dev/%s %s" % (device, _(desc)))) - locationBox.pack_start(radio, gtk.FALSE) + locationBox.pack_start(radio, False) self.bootDevices[key] = (radio, device, desc) if self.bl.getDevice() == device: - radio.set_active(gtk.TRUE) + radio.set_active(True) else: - radio.set_active(gtk.FALSE) + radio.set_active(False) spacer = gtk.Label("") spacer.set_size_request(25, 1) - locationBox.pack_start(spacer, gtk.FALSE) + locationBox.pack_start(spacer, False) orderButton = gtk.Button(_("_Change Drive Order")) - locationBox.pack_start(orderButton, gtk.FALSE) + locationBox.pack_start(orderButton, False) orderButton.connect("clicked", self.editDriveOrder) self.setMbrLabel(self.driveOrder[0]) @@ -81,7 +81,7 @@ class BootloaderLocationWidget: def editDriveOrder(self, *args): dialog = gtk.Dialog(_("Edit Drive Order"), flags = gtk.DIALOG_MODAL) gui.addFrame(dialog) - dialog.set_modal(gtk.TRUE) + dialog.set_modal(True) dialog.set_position(gtk.WIN_POS_CENTER) label = gui.WrappingLabel(_("Arrange the drives to be in the same " diff --git a/iw/checklist.py b/iw/checklist.py index e99066eaa..6e0dcfcdc 100644 --- a/iw/checklist.py +++ b/iw/checklist.py @@ -28,7 +28,7 @@ class CheckList (gtk.TreeView): for i in range(1, columns + 1): renderer = gtk.CellRendererText() column = gtk.TreeViewColumn('Text', renderer, text=i) - column.set_clickable(gtk.FALSE) + column.set_clickable(False) self.append_column(column) # XXX need to handle the multicolumn case better still.... @@ -52,16 +52,16 @@ class CheckList (gtk.TreeView): column = gtk.TreeViewColumn('', self.checkboxrenderer, active=0) # column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) # column.set_fixed_width(40) - column.set_clickable(gtk.TRUE) + column.set_clickable(True) self.checkboxrenderer.connect ("toggled", self.toggled_item) self.append_column(column) self.create_columns(columns) - self.set_rules_hint(gtk.FALSE) - self.set_headers_visible(gtk.FALSE) + self.set_rules_hint(False) + self.set_headers_visible(False) self.columns_autosize() - self.set_enable_search(gtk.FALSE) + self.set_enable_search(False) # keep track of the number of rows we have so we can # iterate over them all @@ -164,7 +164,7 @@ def main(): win = gtk.Window() cl = CheckList(1) for i in range(1, 10): - cl.append_row("%s" %(i,), gtk.FALSE) + cl.append_row("%s" %(i,), False) sw = gtk.ScrolledWindow() sw.set_policy (gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) diff --git a/iw/confirm_gui.py b/iw/confirm_gui.py index 6037085bd..6880e8945 100644 --- a/iw/confirm_gui.py +++ b/iw/confirm_gui.py @@ -24,26 +24,26 @@ class ConfirmWindow (InstallWindow): # ConfirmWindow tag="aboutupgrade" or "aboutinstall" def getScreen (self, labelText, longText): - hbox = gtk.HBox (gtk.TRUE, 5) - box = gtk.VBox (gtk.FALSE, 5) + hbox = gtk.HBox (True, 5) + box = gtk.VBox (False, 5) pix = gui.readImageFromFile ("about-to-install.png") if pix: a = gtk.Alignment () a.add (pix) a.set (0.5, 0.5, 1.0, 1.0) - hbox.pack_start (a, gtk.FALSE) + hbox.pack_start (a, False) label = gtk.Label (labelText) - label.set_line_wrap (gtk.TRUE) + label.set_line_wrap (True) label.set_size_request(190, -1) label2 = gtk.Label (longText) - label2.set_line_wrap (gtk.TRUE) + label2.set_line_wrap (True) label2.set_size_request(190, -1) - box.pack_start (label, gtk.FALSE) - box.pack_start (label2, gtk.FALSE) + box.pack_start (label, False) + box.pack_start (label2, False) box.set_border_width (5) a = gtk.Alignment () diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py index 6ecc2e72c..c5973bb6c 100644 --- a/iw/congrats_gui.py +++ b/iw/congrats_gui.py @@ -25,9 +25,9 @@ class CongratulationWindow (InstallWindow): def __init__ (self, ics): InstallWindow.__init__(self, ics) - ics.setPrevEnabled(gtk.FALSE) - ics.setHelpButtonEnabled(gtk.FALSE) - ics.setHelpEnabled(gtk.FALSE) + ics.setPrevEnabled(False) + ics.setHelpButtonEnabled(False) + ics.setHelpEnabled(False) # this mucks around a bit, but it's the weird case and it's # better than adding a lot of complication to the normal ics.cw.mainxml.get_widget("nextButton").hide() @@ -40,9 +40,9 @@ class CongratulationWindow (InstallWindow): # CongratulationWindow tag=NA def getScreen (self): - self.ics.setHelpEnabled (gtk.FALSE) + self.ics.setHelpEnabled (False) - hbox = gtk.HBox (gtk.FALSE, 5) + hbox = gtk.HBox (False, 5) pix = gui.readImageFromFile ("done.png") if pix: @@ -50,7 +50,7 @@ class CongratulationWindow (InstallWindow): a.add (pix) a.set (0.5, 0.5, 1.0, 1.0) a.set_size_request(200, -1) - hbox.pack_start (a, gtk.FALSE, gtk.FALSE, 36) + hbox.pack_start (a, False, False, 36) bootstr = "" if iutil.getArch() == "s390": @@ -77,6 +77,6 @@ class CongratulationWindow (InstallWindow): label = gui.WrappingLabel(txt) - hbox.pack_start (label, gtk.TRUE, gtk.TRUE) + hbox.pack_start (label, True, True) return hbox diff --git a/iw/dependencies_gui.py b/iw/dependencies_gui.py index 4a3ea9f62..8d26fb31c 100644 --- a/iw/dependencies_gui.py +++ b/iw/dependencies_gui.py @@ -56,7 +56,7 @@ class UnresolvedDependenciesWindow (InstallWindow): #UnresolvedDependenciesWindow tag="depend" def getScreen (self, comps, deps): - self.ics.setHelpEnabled(gtk.TRUE) + self.ics.setHelpEnabled(True) self.deps = deps self.comps = comps @@ -86,7 +86,7 @@ class UnresolvedDependenciesWindow (InstallWindow): self.sizelabel.set_alignment (1, .5) self.updateSize() - rb = gtk.VBox (gtk.FALSE) + rb = gtk.VBox (False) self.dependRB = gtk.RadioButton (None, _("_Install packages to " "satisfy dependencies")) @@ -107,8 +107,8 @@ class UnresolvedDependenciesWindow (InstallWindow): self.causeRB.connect('toggled', self.causeToggled) self.ignoreRB.connect('toggled', self.ignoreToggled) - box = gtk.VBox (gtk.FALSE, 5) - box.pack_start (sw, gtk.TRUE) - box.pack_start (rb, gtk.FALSE) + box = gtk.VBox (False, 5) + box.pack_start (sw, True) + box.pack_start (rb, False) return box diff --git a/iw/desktop_choice_gui.py b/iw/desktop_choice_gui.py index b1838a7f2..3cbf49204 100644 --- a/iw/desktop_choice_gui.py +++ b/iw/desktop_choice_gui.py @@ -49,9 +49,9 @@ class DesktopChoiceWindow (InstallWindow): self.instclass = instclass self.grpset = grpset - vbox = gtk.VBox (gtk.FALSE, 0) + vbox = gtk.VBox (False, 0) vbox.set_border_width (5) - hbox = gtk.HBox (gtk.FALSE, 0) + hbox = gtk.HBox (False, 0) header = _("The default installation environment includes our " "recommended package selection, including:\n\n") @@ -72,18 +72,18 @@ class DesktopChoiceWindow (InstallWindow): label = gui.WrappingLabel(labeltxt) - hbox.pack_start (label, gtk.FALSE, gtk.FALSE, 0) - vbox.pack_start (hbox, gtk.FALSE, gtk.FALSE, 0) + hbox.pack_start (label, False, False, 0) + vbox.pack_start (hbox, False, False, 0) self.acceptRadio = gtk.RadioButton (None, _("_Install default software packages")) self.customizeRadio = gtk.RadioButton (self.acceptRadio, _("_Customize software packages to be installed")) - vbox2 = gtk.VBox (gtk.FALSE) - vbox2.pack_start (self.acceptRadio, gtk.FALSE, gtk.FALSE, 0) - vbox2.pack_start (self.customizeRadio, gtk.FALSE, gtk.FALSE, 0) + vbox2 = gtk.VBox (False) + vbox2.pack_start (self.acceptRadio, False, False, 0) + vbox2.pack_start (self.customizeRadio, False, False, 0) al = gtk.Alignment(0.5, 0) al.add (vbox2) - vbox.pack_start (al, gtk.FALSE, gtk.FALSE, 25) + vbox.pack_start (al, False, False, 25) custom = not self.dispatch.stepInSkipList("package-selection") if custom: self.customizeRadio.set_active(1) diff --git a/iw/driveorderwidget.py b/iw/driveorderwidget.py index 4d79479b2..0bd58fb33 100644 --- a/iw/driveorderwidget.py +++ b/iw/driveorderwidget.py @@ -29,7 +29,7 @@ class DriveOrderWidget: self.driveOrder = driveorder self.diskset = diskset - hbox = gtk.HBox(gtk.FALSE, 5) + hbox = gtk.HBox(False, 5) # different widget for this maybe? self.driveOrderStore = gtk.ListStore(gobject.TYPE_STRING, @@ -45,41 +45,41 @@ class DriveOrderWidget: renderer = gtk.CellRendererText() column = gtk.TreeViewColumn(columnName, renderer, text = i) i = i + 1 - column.set_clickable(gtk.FALSE) + column.set_clickable(False) self.driveOrderView.append_column(column) - self.driveOrderView.set_rules_hint(gtk.FALSE) - self.driveOrderView.set_headers_visible(gtk.FALSE) - self.driveOrderView.set_enable_search(gtk.FALSE) + self.driveOrderView.set_rules_hint(False) + self.driveOrderView.set_headers_visible(False) + self.driveOrderView.set_enable_search(False) self.makeDriveOrderStore() sw.add(self.driveOrderView) self.driveOrderView.set_size_request(375, 80) - hbox.pack_start(sw, gtk.FALSE) + hbox.pack_start(sw, False) - arrowbox = gtk.VBox(gtk.FALSE, 5) + arrowbox = gtk.VBox(False, 5) arrowButton = gtk.Button() arrow = gtk.Arrow(gtk.ARROW_UP, gtk.SHADOW_ETCHED_IN) arrowButton.add(arrow) arrowButton.connect("clicked", self.arrowClicked, gtk.ARROW_UP) - arrowbox.pack_start(arrowButton, gtk.FALSE) + arrowbox.pack_start(arrowButton, False) spacer = gtk.Label("") spacer.set_size_request(10, 1) - arrowbox.pack_start(spacer, gtk.FALSE) + arrowbox.pack_start(spacer, False) arrowButton = gtk.Button() arrow = gtk.Arrow(gtk.ARROW_DOWN, gtk.SHADOW_ETCHED_IN) arrowButton.add(arrow) arrowButton.connect("clicked", self.arrowClicked, gtk.ARROW_DOWN) - arrowbox.pack_start(arrowButton, gtk.FALSE) + arrowbox.pack_start(arrowButton, False) alignment = gtk.Alignment() alignment.set(0, 0.5, 0, 0) alignment.add(arrowbox) - hbox.pack_start(alignment, gtk.FALSE) + hbox.pack_start(alignment, False) self.widget = hbox diff --git a/iw/examine_gui.py b/iw/examine_gui.py index e1401d193..286c3bdae 100644 --- a/iw/examine_gui.py +++ b/iw/examine_gui.py @@ -94,7 +94,7 @@ class UpgradeExamineWindow (InstallWindow): self.doupgrade = dispatch.stepInSkipList("installtype") self.parts = self.id.rootParts - vbox = gtk.VBox (gtk.FALSE, 10) + vbox = gtk.VBox (False, 10) vbox.set_border_width (8) r = self.createUpgradeOption() @@ -105,10 +105,10 @@ class UpgradeExamineWindow (InstallWindow): r.setCurrent(REINSTALL_STR) r.setToggleCallback(self.optionToggled) - box = gtk.VBox (gtk.FALSE) - box.pack_start(b, gtk.FALSE) + box = gtk.VBox (False) + box.pack_start(b, False) - vbox.pack_start (box, gtk.FALSE) + vbox.pack_start (box, False) self.root = self.parts[0] # @@ -117,17 +117,17 @@ class UpgradeExamineWindow (InstallWindow): # self.individualPackages = gtk.CheckButton (_("_Customize packages to be " # "upgraded")) # self.individualPackages.set_active (not dispatch.stepInSkipList("indivpackage")) -# ipbox = gtk.HBox(gtk.FALSE) -# crackhbox = gtk.HBox(gtk.FALSE) +# ipbox = gtk.HBox(False) +# crackhbox = gtk.HBox(False) # crackhbox.set_size_request(70, -1) -# ipbox.pack_start(crackhbox, gtk.FALSE, gtk.FALSE) -# ipbox.pack_start(self.individualPackages, gtk.TRUE, gtk.TRUE) +# ipbox.pack_start(crackhbox, False, False) +# ipbox.pack_start(self.individualPackages, True, True) # r.packWidgetInEntry(UPGRADE_STR, ipbox) self.individualPackages = None # hack hack hackity hack - upboxtmp = gtk.VBox(gtk.FALSE, 5) + upboxtmp = gtk.VBox(False, 5) uplabelstr = _("The following installed system will be upgraded:") self.uplabel = gtk.Label(uplabelstr) self.uplabel.set_alignment(0.0, 0.0) @@ -151,22 +151,22 @@ class UpgradeExamineWindow (InstallWindow): upboxtmp.pack_start(self.uplabel) # more indentation - box1 = gtk.HBox(gtk.FALSE) - crackhbox = gtk.HBox(gtk.FALSE) + box1 = gtk.HBox(False) + crackhbox = gtk.HBox(False) crackhbox.set_size_request(35, -1) - box1.pack_start(crackhbox, gtk.FALSE, gtk.FALSE) - box1.pack_start(self.upgradecombo, gtk.FALSE, gtk.FALSE) - upboxtmp.pack_start(box1, gtk.FALSE, gtk.FALSE) + box1.pack_start(crackhbox, False, False) + box1.pack_start(self.upgradecombo, False, False) + upboxtmp.pack_start(box1, False, False) # hack indent it - upbox = gtk.HBox(gtk.FALSE) + upbox = gtk.HBox(False) - crackhbox = gtk.HBox(gtk.FALSE) + crackhbox = gtk.HBox(False) crackhbox.set_size_request(70, -1) - upbox.pack_start(crackhbox, gtk.FALSE, gtk.FALSE) -# upbox.pack_start(upboxtmp, gtk.TRUE, gtk.TRUE) - upbox.pack_start(upboxtmp, gtk.FALSE, gtk.FALSE) + upbox.pack_start(crackhbox, False, False) +# upbox.pack_start(upboxtmp, True, True) + upbox.pack_start(upboxtmp, False, False) # all done phew r.packWidgetInEntry(UPGRADE_STR, upbox) diff --git a/iw/fdisk_gui.py b/iw/fdisk_gui.py index 522e1389f..42b568f7d 100644 --- a/iw/fdisk_gui.py +++ b/iw/fdisk_gui.py @@ -61,7 +61,7 @@ class FDiskWindow(InstallWindow): term.set_color_background(gtk.gdk.color_parse('white')) term.set_color_foreground(gtk.gdk.color_parse('black')) term.connect("child_exited", self.child_died, widget) - term.reset(gtk.TRUE, gtk.TRUE) + term.reset(True, True) self.drive = drive @@ -95,8 +95,8 @@ class FDiskWindow(InstallWindow): self.partrequests = partrequests self.intf = intf - self.windowContainer = gtk.VBox(gtk.FALSE) - self.buttonBox = gtk.VBox(gtk.FALSE, 5) + self.windowContainer = gtk.VBox(False) + self.buttonBox = gtk.VBox(False, 5) self.buttonBox.set_border_width(5) box = gtk.VButtonBox() box.set_layout("start") @@ -121,8 +121,8 @@ class FDiskWindow(InstallWindow): viewport.set_shadow_type(gtk.SHADOW_ETCHED_IN) sw.set_size_request(-1, 400) - self.buttonBox.pack_start(label, gtk.FALSE) - self.buttonBox.pack_start(sw, gtk.FALSE) + self.buttonBox.pack_start(label, False) + self.buttonBox.pack_start(sw, False) self.windowContainer.pack_start(self.buttonBox) self.ics.setNextEnabled(1) diff --git a/iw/firewall_gui.py b/iw/firewall_gui.py index 91c421d74..3c64f0fb2 100644 --- a/iw/firewall_gui.py +++ b/iw/firewall_gui.py @@ -58,9 +58,9 @@ class FirewallWindow (InstallWindow): def activate_firewall (self, widget): if self.disabled_radio.get_active (): - self.table.set_sensitive(gtk.FALSE) + self.table.set_sensitive(False) else: - self.table.set_sensitive(gtk.TRUE) + self.table.set_sensitive(True) def getScreen (self, intf, network, firewall, security): self.firewall = firewall @@ -73,7 +73,7 @@ class FirewallWindow (InstallWindow): self.netCBs = {} - box = gtk.VBox (gtk.FALSE, 5) + box = gtk.VBox (False, 5) box.set_border_width (5) label = gui.WrappingLabel (_("A firewall can help prevent " @@ -83,9 +83,9 @@ class FirewallWindow (InstallWindow): label.set_alignment (0.0, 0) label.set_size_request(450, -1) - box.pack_start(label, gtk.FALSE) + box.pack_start(label, False) - vbox = gtk.VBox (gtk.FALSE) + vbox = gtk.VBox (False) self.disabled_radio = gtk.RadioButton (None, (_("N_o firewall"))) self.enabled_radio = gtk.RadioButton (self.disabled_radio, @@ -100,10 +100,10 @@ class FirewallWindow (InstallWindow): a.add (vbox) a.set (0.3, 0, 0.7, 1.0) - box.pack_start (a, gtk.FALSE, 5) + box.pack_start (a, False, 5) self.table = gtk.Table (2, 8) - box.pack_start (self.table, gtk.FALSE, 5) + box.pack_start (self.table, False, 5) y = 0 label = gui.WrappingLabel (_("You can use a firewall to allow " @@ -116,7 +116,7 @@ class FirewallWindow (InstallWindow): self.table.attach(label, 0, 2, y, y + 1, gtk.EXPAND | gtk.FILL, gtk.FILL, 5, 5) y = y + 1 - hbox = gtk.HBox(gtk.FALSE, 10) + hbox = gtk.HBox(False, 10) self.incoming = checklist.CheckList(1) self.incoming.set_size_request(-1, 125) @@ -133,9 +133,9 @@ class FirewallWindow (InstallWindow): self.table.attach (incomingSW, 0, 2, y, y + 1, gtk.EXPAND|gtk.FILL, gtk.FILL, 5, 5) if self.firewall.enabled == 0: - self.disabled_radio.set_active (gtk.TRUE) + self.disabled_radio.set_active (True) else: - self.enabled_radio.set_active(gtk.TRUE) + self.enabled_radio.set_active(True) self.activate_firewall(None) @@ -153,10 +153,10 @@ class FirewallWindow (InstallWindow): l.set_size_request(400, -1) l.set_alignment(0.0, 0.0) - selbox.pack_start(l, gtk.FALSE) + selbox.pack_start(l, False) label = gtk.Label(_("Enable _SELinux?:")) - label.set_use_underline(gtk.TRUE) + label.set_use_underline(True) self.selinux_combo = gtk.combo_box_new_text() label.set_mnemonic_widget(self.selinux_combo) @@ -167,16 +167,16 @@ class FirewallWindow (InstallWindow): hbox = gtk.HBox() hbox.set_spacing(8) - hbox.pack_start(label, gtk.FALSE) - hbox.pack_start(self.selinux_combo, gtk.FALSE) + hbox.pack_start(label, False) + hbox.pack_start(self.selinux_combo, False) selbox.pack_start(hbox) if flags.selinux == 0: - selbox.set_sensitive(gtk.FALSE) + selbox.set_sensitive(False) if (SELINUX_DEFAULT == 1) or flags.selinux: - box.pack_start (gtk.HSeparator(), gtk.FALSE) - box.pack_start(selbox, gtk.FALSE) + box.pack_start (gtk.HSeparator(), False) + box.pack_start(selbox, False) return box diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py index de7829d50..4ec835219 100644 --- a/iw/installpath_gui.py +++ b/iw/installpath_gui.py @@ -73,7 +73,7 @@ class InstallPathWindow (InstallWindow): self.method = method self.dispatch = dispatch - vbox = gtk.VBox (gtk.FALSE, 10) + vbox = gtk.VBox (False, 10) vbox.set_border_width (8) self.r = self.createInstallTypeOption() @@ -105,10 +105,10 @@ class InstallPathWindow (InstallWindow): self.r.setCurrent(self.currentClassName) - box = gtk.VBox (gtk.FALSE) - box.pack_start(b, gtk.FALSE) + box = gtk.VBox (False) + box.pack_start(b, False) - vbox.pack_start (box, gtk.FALSE) + vbox.pack_start (box, False) return vbox diff --git a/iw/ipwidget.py b/iw/ipwidget.py index 362553cb3..f64055991 100644 --- a/iw/ipwidget.py +++ b/iw/ipwidget.py @@ -51,9 +51,9 @@ class IPEditor: hbox = gtk.HBox() for name in ip_fields: - hbox.pack_start(self.entrys[name], gtk.FALSE, gtk.FALSE) + hbox.pack_start(self.entrys[name], False, False) if name != 'entry4': - hbox.pack_start(gtk.Label('.'), gtk.FALSE, gtk.FALSE) + hbox.pack_start(gtk.Label('.'), False, False) self.widget = hbox @@ -133,7 +133,7 @@ if __name__ == "__main__": vbox.pack_start(ip.getWidget()) button = gtk.Button("Quit") button.connect("pressed", output, ip) - vbox.pack_start(button, gtk.FALSE, gtk.FALSE) + vbox.pack_start(button, False, False) win.add(vbox) win.show_all() gtk.main() diff --git a/iw/language_gui.py b/iw/language_gui.py index 86f85ee00..bc8ad5bf4 100644 --- a/iw/language_gui.py +++ b/iw/language_gui.py @@ -45,26 +45,26 @@ class LanguageWindow (InstallWindow): path = self.listStore.get_path(iter) col = self.listView.get_column(0) - self.listView.scroll_to_cell(path, col, gtk.TRUE, 0.5, 0.5) - self.listView.set_cursor(path, col, gtk.FALSE) + self.listView.scroll_to_cell(path, col, True, 0.5, 0.5) + self.listView.set_cursor(path, col, False) # LanguageWindow tag="lang" def getScreen (self, intf, instLang): self.running = 0 - mainBox = gtk.VBox (gtk.FALSE, 10) + mainBox = gtk.VBox (False, 10) - hbox = gtk.HBox(gtk.FALSE, 5) + hbox = gtk.HBox(False, 5) pix = gui.readImageFromFile ("gnome-globe.png") if pix: a = gtk.Alignment () a.add (pix) - hbox.pack_start (a, gtk.FALSE) + hbox.pack_start (a, False) label = gtk.Label (_("What language would you like to use during the " "installation process?")) - label.set_line_wrap (gtk.TRUE) + label.set_line_wrap (True) label.set_size_request(350, -1) - hbox.pack_start(label, gtk.FALSE) + hbox.pack_start(label, False) self.instLang = instLang @@ -87,7 +87,7 @@ class LanguageWindow (InstallWindow): self.listView = gtk.TreeView(self.listStore) col = gtk.TreeViewColumn(None, gtk.CellRendererText(), markup=0) self.listView.append_column(col) - self.listView.set_property("headers-visible", gtk.FALSE) + self.listView.set_property("headers-visible", False) current = instLang.getCurrent() iter = self.listStore.get_iter_first() @@ -108,8 +108,8 @@ class LanguageWindow (InstallWindow): setupTreeViewFixupIdleHandler(self.listView, self.listStore) - mainBox.pack_start (hbox, gtk.FALSE, gtk.FALSE, 10) - mainBox.pack_start (sw, gtk.TRUE, gtk.TRUE) + mainBox.pack_start (hbox, False, False, 10) + mainBox.pack_start (sw, True, True) self.running = 1 diff --git a/iw/language_support_gui.py b/iw/language_support_gui.py index 1bca0feef..0d8e9d5d7 100644 --- a/iw/language_support_gui.py +++ b/iw/language_support_gui.py @@ -56,7 +56,7 @@ class LanguageSupportWindow (InstallWindow): # the UI is confusing because there is no default lang and no # langauges supported if self.defaultLang is None or self.defaultLang == "": - self.languageList.set_active(oldidx, gtk.TRUE) + self.languageList.set_active(oldidx, True) self.rebuild_combo() def rebuild_combo(self): @@ -69,9 +69,9 @@ class LanguageSupportWindow (InstallWindow): if len(list) == 0: list = [""] - self.ics.setNextEnabled (gtk.FALSE) + self.ics.setNextEnabled (False) else: - self.ics.setNextEnabled (gtk.TRUE) + self.ics.setNextEnabled (True) curidx = self.deflang_combo.get_active() if curidx >= 0 and len(self.deflang_values) > 0: @@ -89,14 +89,14 @@ class LanguageSupportWindow (InstallWindow): self.deflang_combo.set_active(index) def select_all (self, data): - self.ics.setNextEnabled (gtk.TRUE) + self.ics.setNextEnabled (True) for row in range(self.maxrows): - self.languageList.set_active(row, gtk.TRUE) + self.languageList.set_active(row, True) self.rebuild_combo() def select_default (self, data): - self.ics.setNextEnabled (gtk.TRUE) + self.ics.setNextEnabled (True) curidx = self.deflang_combo.get_active() if curidx >= 0: @@ -104,24 +104,24 @@ class LanguageSupportWindow (InstallWindow): for row in range(self.maxrows): if self.languageList.get_text(row, 1) == deflang: - self.languageList.set_active(row, gtk.TRUE) + self.languageList.set_active(row, True) else: - self.languageList.set_active(row, gtk.FALSE) + self.languageList.set_active(row, False) self.rebuild_combo() def reset (self, data): - self.ics.setNextEnabled (gtk.TRUE) + self.ics.setNextEnabled (True) list = [] for row in range(self.maxrows): item = self.languageList.get_text (row, 1) if item in self.origLangs: - self.languageList.set_active(row, gtk.TRUE) + self.languageList.set_active(row, True) list.append (item) else: - self.languageList.set_active(row, gtk.FALSE) + self.languageList.set_active(row, False) self.defaultLang = self.oldDefaultLang self.createDefaultLangMenu(list) @@ -138,8 +138,8 @@ class LanguageSupportWindow (InstallWindow): if self.languageList.get_text(row, 1) == currentDefault: path = store.get_path(store.get_iter((row,))) col = self.languageList.get_column(0) - self.languageList.set_cursor(path, col, gtk.FALSE) - self.languageList.scroll_to_cell(path, col, gtk.TRUE, 0.5, 0.5) + self.languageList.set_cursor(path, col, False) + self.languageList.scroll_to_cell(path, col, True, 0.5, 0.5) break row = row + 1 @@ -185,9 +185,9 @@ class LanguageSupportWindow (InstallWindow): if self.origLangs == []: self.origLangs.append(self.defaultLang) - vbox = gtk.VBox (gtk.FALSE, 10) + vbox = gtk.VBox (False, 10) vbox.set_border_width(5) - hbox = gtk.HBox (gtk.FALSE) + hbox = gtk.HBox (False) # create option menu of default langs label = gui.MnemonicLabel(_("Select the _default language for the system: ")) @@ -196,22 +196,22 @@ class LanguageSupportWindow (InstallWindow): self.createDefaultLangMenu(self.supportedLangs) label.set_mnemonic_widget(self.deflang_combo) - hbox.pack_start (label, gtk.FALSE, 20) - hbox.pack_start (self.deflang_combo, gtk.FALSE, 20) - vbox.pack_start (hbox, gtk.FALSE, 50) + hbox.pack_start (label, False, 20) + hbox.pack_start (self.deflang_combo, False, 20) + vbox.pack_start (hbox, False, 50) sep = gtk.HSeparator () - vbox.pack_start (sep, gtk.FALSE, 15) + vbox.pack_start (sep, False, 15) label = gui.MnemonicLabel(_("Select _additional languages to install " "on the system:")) label.set_alignment (0.0, 0.5) - label.set_line_wrap (gtk.TRUE) + label.set_line_wrap (True) label.set_size_request(400, -1) - vbox.pack_start (label, gtk.FALSE) + vbox.pack_start (label, False) - hbox = gtk.HBox (gtk.FALSE, 5) + hbox = gtk.HBox (False, 5) # langs we want to support self.languageList = checklist.CheckList(1) @@ -222,10 +222,10 @@ class LanguageSupportWindow (InstallWindow): for locale in self.languages: if locale == self.defaultLang or (locale in self.supportedLangs): - self.languageList.append_row((locale, ""), gtk.TRUE) + self.languageList.append_row((locale, ""), True) list.append(locale) else: - self.languageList.append_row((locale, ""), gtk.FALSE) + self.languageList.append_row((locale, ""), False) self.maxrows = self.maxrows + 1 @@ -236,7 +236,7 @@ class LanguageSupportWindow (InstallWindow): sw.add (self.languageList) sw.set_shadow_type(gtk.SHADOW_IN) - vbox2 = gtk.VBox (gtk.FALSE, 12) + vbox2 = gtk.VBox (False, 12) all_button = gtk.Button (_("_Select All")) all_button.set_size_request(160, -1) @@ -248,7 +248,7 @@ class LanguageSupportWindow (InstallWindow): default_button = gtk.Button() label = gui.MnemonicLabel(_("Select Default _Only")) label.set_size_request(150,-1) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_justify(gtk.JUSTIFY_CENTER) label.set_mnemonic_widget(default_button) default_button.add(label) @@ -263,12 +263,12 @@ class LanguageSupportWindow (InstallWindow): a3 = gtk.Alignment (0.5, 0.5) a3.add (reset_button) - vbox2.pack_start (a1, gtk.FALSE, 10) - vbox2.pack_start (a2, gtk.FALSE) - vbox2.pack_start (a3, gtk.FALSE) - hbox.pack_start (sw, gtk.TRUE, 10) - hbox.pack_start (vbox2, gtk.FALSE, 10) - vbox.pack_start (hbox, gtk.TRUE) + vbox2.pack_start (a1, False, 10) + vbox2.pack_start (a2, False) + vbox2.pack_start (a3, False) + hbox.pack_start (sw, True, 10) + hbox.pack_start (vbox2, False, 10) + vbox.pack_start (hbox, True) # default button # alignment = gtk.Alignment (0.0, 0.0) diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py index 6ac470a28..fc5a504a8 100644 --- a/iw/lvm_dialog_gui.py +++ b/iw/lvm_dialog_gui.py @@ -290,10 +290,10 @@ class VolumeGroupEditor: "volume group will be too small to " "hold the currently defined logical " "volumes."), custom_icon="error") - return gtk.FALSE + return False self.updateVGSpaceLabels(alt_pvlist = pvlist) - return gtk.TRUE + return True def createAllowedLvmPartitionsList(self, alllvmparts, reqlvmpart, partitions, preexist = 0): @@ -979,7 +979,7 @@ class VolumeGroupEditor: self.peCombo = self.createPEOptionMenu(self.origvgrequest.pesize) lbl.set_mnemonic_widget(self.peCombo) if origvgrequest.getPreExisting(): - self.peCombo.set_sensitive(gtk.FALSE) + self.peCombo.set_sensitive(False) maintable.attach(lbl, 0, 1, row, row + 1, gtk.EXPAND|gtk.FILL, gtk.SHRINK) @@ -988,7 +988,7 @@ class VolumeGroupEditor: (self.lvmlist, sw) = self.createAllowedLvmPartitionsList(self.availlvmparts, self.origvgrequest.physicalVolumes, self.partitions, origvgrequest.getPreExisting()) if origvgrequest.getPreExisting(): - self.lvmlist.set_sensitive(gtk.FALSE) + self.lvmlist.set_sensitive(False) self.lvmlist.set_size_request(275, 80) lbl = createAlignedLabel(_("Physical Volumes to _Use:")) lbl.set_mnemonic_widget(self.lvmlist) @@ -1003,12 +1003,12 @@ class VolumeGroupEditor: labelalign = gtk.Alignment() labelalign.set(1.0, 0.5, 0.0, 0.0) labelalign.add(self.usedSpaceLabel) - lbox.pack_start(labelalign, gtk.FALSE, gtk.FALSE) + lbox.pack_start(labelalign, False, False) self.usedPercentLabel = gtk.Label("") labelalign = gtk.Alignment() labelalign.set(1.0, 0.5, 0.0, 0.0) labelalign.add(self.usedPercentLabel) - lbox.pack_start(labelalign, gtk.FALSE, gtk.FALSE, padding=10) + lbox.pack_start(labelalign, False, False, padding=10) maintable.attach(lbox, 1, 2, row, row + 1, gtk.EXPAND|gtk.FILL, gtk.SHRINK) maintable.set_row_spacing(row, 0) row = row + 1 @@ -1020,12 +1020,12 @@ class VolumeGroupEditor: labelalign = gtk.Alignment() labelalign.set(1.0, 0.5, 0.0, 0.0) labelalign.add(self.freeSpaceLabel) - lbox.pack_start(labelalign, gtk.FALSE, gtk.FALSE) + lbox.pack_start(labelalign, False, False) self.freePercentLabel = gtk.Label("") labelalign = gtk.Alignment() labelalign.set(1.0, 0.5, 0.0, 0.0) labelalign.add(self.freePercentLabel) - lbox.pack_start(labelalign, gtk.FALSE, gtk.FALSE, padding=10) + lbox.pack_start(labelalign, False, False, padding=10) maintable.attach(lbox, 1, 2, row, row + 1, gtk.EXPAND|gtk.FILL, gtk.SHRINK) maintable.set_row_spacing(row, 0) diff --git a/iw/mouse_gui.py b/iw/mouse_gui.py index a76e2c84d..608c154c4 100644 --- a/iw/mouse_gui.py +++ b/iw/mouse_gui.py @@ -46,7 +46,7 @@ class MouseWindow(InstallWindow): (model, iter) = selection.get_selected() if iter: self.serialDevice = model.get_value(iter, 1) - self.ics.setNextEnabled(gtk.TRUE) + self.ics.setNextEnabled(True) else: self.serialDevice = None @@ -59,14 +59,14 @@ class MouseWindow(InstallWindow): if model.iter_has_child(iter): self.devview.get_selection().unselect_all() - self.devview.set_sensitive(gtk.FALSE) - self.emulate3.set_sensitive(gtk.FALSE) - self.ics.setNextEnabled(gtk.FALSE) + self.devview.set_sensitive(False) + self.emulate3.set_sensitive(False) + self.ics.setNextEnabled(False) return cur = model.get_value(iter, 1) - self.emulate3.set_sensitive(gtk.TRUE) + self.emulate3.set_sensitive(True) (make, model, gpmproto, xproto, device, emulate) = self.mice[cur] if device == "ttyS": @@ -133,7 +133,7 @@ class MouseWindow(InstallWindow): self.mousestore.set_sort_column_id(0, gtk.SORT_ASCENDING) self.mouseview = gtk.TreeView(self.mousestore) - self.mouseview.set_property("headers-visible", gtk.TRUE) + self.mouseview.set_property("headers-visible", True) col = gtk.TreeViewColumn(_("_Model"), gtk.CellRendererText(), text=0) self.mouseview.append_column(col) selection = self.mouseview.get_selection() @@ -157,15 +157,15 @@ class MouseWindow(InstallWindow): elif self.mousestore.get_value(iter, 1) == currentMouse: if parent: path = self.mousestore.get_path(parent) - self.mouseview.expand_row(path, gtk.TRUE) + self.mouseview.expand_row(path, True) selection = self.mouseview.get_selection() selection.unselect_all() selection.select_iter(iter) path = self.mousestore.get_path(iter) col = self.mouseview.get_column(0) - self.mouseview.set_cursor(path, col, gtk.FALSE) + self.mouseview.set_cursor(path, col, False) if recenter: - self.mouseview.scroll_to_cell(path, col, gtk.TRUE, + self.mouseview.scroll_to_cell(path, col, True, 0.5, 0.5) fndmouse = 1 break @@ -184,15 +184,15 @@ class MouseWindow(InstallWindow): path = (int(self.serialDevice[4]),) selection.select_path(path) col = self.devview.get_column(0) - self.devview.set_cursor(path, col, gtk.FALSE) + self.devview.set_cursor(path, col, False) if recenter: - self.devview.scroll_to_cell(path, col, gtk.TRUE, 0.5, 0.5) - self.ics.setNextEnabled(gtk.TRUE) - self.devview.set_sensitive(gtk.TRUE) + self.devview.scroll_to_cell(path, col, True, 0.5, 0.5) + self.ics.setNextEnabled(True) + self.devview.set_sensitive(True) elif currentDev: self.devview.get_selection().unselect_all(); - self.devview.set_sensitive(gtk.FALSE) - self.ics.setNextEnabled(gtk.TRUE) + self.devview.set_sensitive(False) + self.ics.setNextEnabled(True) else: # XXX - see if this is the 'No - mouse' case if fndmouse: @@ -203,15 +203,15 @@ class MouseWindow(InstallWindow): if xdev == "none": self.devview.get_selection().unselect_all(); - self.devview.set_sensitive(gtk.FALSE) - self.ics.setNextEnabled(gtk.TRUE) + self.devview.set_sensitive(False) + self.ics.setNextEnabled(True) else: # otherwise disable the list self.devview.get_selection().unselect_all(); self.serialDevice = None - self.ics.setNextEnabled(gtk.FALSE) - self.devview.set_sensitive(gtk.TRUE) + self.ics.setNextEnabled(False) + self.devview.set_sensitive(True) self.emulate3.set_active(emulate3) self.ignoreEvents = 0 @@ -236,22 +236,22 @@ class MouseWindow(InstallWindow): self.setCurrent(currentDev, currentMouse, emulate3) # set up the box for this screen - box = gtk.VBox(gtk.FALSE, 5) + box = gtk.VBox(False, 5) box.set_border_width(5) # top header, includes graphic and instructions - hbox = gtk.HBox(gtk.FALSE, 5) + hbox = gtk.HBox(False, 5) pix = gui.readImageFromFile ("gnome-mouse.png") if pix: a = gtk.Alignment() a.add(pix) a.set(0.0, 0.0, 0.0, 0.0) - hbox.pack_start(a, gtk.FALSE) + hbox.pack_start(a, False) label = gui.MnemonicLabel(_("Select the appropriate mouse for the system.")) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_size_request(350, -1) - hbox.pack_start(label, gtk.FALSE) - box.pack_start(hbox, gtk.FALSE) + hbox.pack_start(label, False) + box.pack_start(hbox, False) # next is the mouse tree sw = gtk.ScrolledWindow() @@ -268,9 +268,9 @@ class MouseWindow(InstallWindow): serial_sw.set_shadow_type(gtk.SHADOW_IN) serial_sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_NEVER) serial_sw.add(self.devview) - box.pack_start(serial_sw, gtk.FALSE) + box.pack_start(serial_sw, False) # finally the emulate 3 buttons - box.pack_start(self.emulate3, gtk.FALSE) + box.pack_start(self.emulate3, False) return box diff --git a/iw/network_gui.py b/iw/network_gui.py index b89b5763d..dc943d2df 100644 --- a/iw/network_gui.py +++ b/iw/network_gui.py @@ -149,7 +149,7 @@ class NetworkWindow(InstallWindow): def setIPTableSensitivity(self): numactive = self.getNumberActiveDevices() if numactive == 0: - state = gtk.FALSE + state = False else: state = not self.anyUsingDHCP() @@ -206,7 +206,7 @@ class NetworkWindow(InstallWindow): editWin = gtk.Dialog(_("Edit Interface %s") % (dev,), flags=gtk.DIALOG_MODAL) gui.addFrame(editWin) - editWin.set_modal(gtk.TRUE) + editWin.set_modal(True) # editWin.set_size_request(350, 200) editWin.set_position (gtk.WIN_POS_CENTER) @@ -217,7 +217,7 @@ class NetworkWindow(InstallWindow): 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")) @@ -226,8 +226,8 @@ class NetworkWindow(InstallWindow): bootcb.set_active(onboot) align.add(bootcb) - devbox.pack_start(align, gtk.FALSE, padding=6) -# devbox.pack_start(gtk.HSeparator(), gtk.FALSE, padding=3) + devbox.pack_start(align, False, padding=6) +# devbox.pack_start(gtk.HSeparator(), False, padding=3) options = [(_("_IP Address"), "ipaddr"), (_("Net_mask"), "netmask")] @@ -259,7 +259,7 @@ class NetworkWindow(InstallWindow): for t in range(len(options)): label = gtk.Label("%s:" %(options[t][0],)) label.set_alignment(0.0, 0.5) - label.set_property("use-underline", gtk.TRUE) + label.set_property("use-underline", True) ipTable.attach(label, 0, 1, t+1, t+2, gtk.FILL, 0, 10) entry = ipwidget.IPEditor() @@ -268,7 +268,7 @@ class NetworkWindow(InstallWindow): label.set_mnemonic_widget(entry.getFocusableWidget()) ipTable.attach(entry.getWidget(), 1, 2, t+1, t+2, 0, gtk.FILL|gtk.EXPAND) - devbox.pack_start(ipTable, gtk.FALSE, gtk.FALSE, 6) + devbox.pack_start(ipTable, False, False, 6) devbox.set_border_width(6) deventrys = {} @@ -278,7 +278,7 @@ class NetworkWindow(InstallWindow): for t in range(len(devopts)): label = gtk.Label("%s:" %(devopts[t][0],)) label.set_alignment(0.0, 0.5) - label.set_property("use-underline", gtk.TRUE) + label.set_property("use-underline", True) devTable.attach(label, 0, 1, t, t+1, gtk.FILL, 0, 10) entry = gtk.Entry() @@ -288,7 +288,7 @@ class NetworkWindow(InstallWindow): devTable.attach(entry, 1, 2, t, t+1, 0, gtk.FILL|gtk.EXPAND) - devbox.pack_start(devTable, gtk.FALSE, gtk.FALSE, 6) + devbox.pack_start(devTable, False, False, 6) framelab = _("Configure %s") % (dev,) descr = self.devices[dev].get("desc") @@ -437,9 +437,9 @@ class NetworkWindow(InstallWindow): for device in devnames: onboot = self.devices[device].get("ONBOOT") if ((num == 0 and not onboot) or onboot == "yes"): - active = gtk.TRUE + active = True else: - active = gtk.FALSE + active = False bootproto = self.devices[device].get("bootproto") if not bootproto: @@ -472,7 +472,7 @@ class NetworkWindow(InstallWindow): self.ethdevices.set_column_sizing (2, gtk.TREE_VIEW_COLUMN_GROW_ONLY) # self.ethdevices.set_column_title(3, (_("Description"))) # self.ethdevices.set_column_sizing (3, gtk.TREE_VIEW_COLUMN_GROW_ONLY) - self.ethdevices.set_headers_visible(gtk.TRUE) + self.ethdevices.set_headers_visible(True) self.ignoreEvents = 1 iter = self.ethdevices.store.get_iter_first() @@ -495,7 +495,7 @@ class NetworkWindow(InstallWindow): # NetworkWindow tag="netconf" def getScreen(self, network, dir, intf): self.intf = intf - box = gtk.VBox(gtk.FALSE) + box = gtk.VBox(False) box.set_border_width(6) self.network = network @@ -508,7 +508,7 @@ class NetworkWindow(InstallWindow): self.hostname = self.network.hostname - devhbox = gtk.HBox(gtk.FALSE) + devhbox = gtk.HBox(False) self.devlist = self.setupDevices() @@ -518,15 +518,15 @@ class NetworkWindow(InstallWindow): devlistSW.set_shadow_type(gtk.SHADOW_IN) devlistSW.add(self.devlist) devlistSW.set_size_request(-1, 100) - devhbox.pack_start(devlistSW, gtk.FALSE, padding=10) + devhbox.pack_start(devlistSW, False, padding=10) buttonbar = gtk.VButtonBox() buttonbar.set_layout(gtk.BUTTONBOX_START) buttonbar.set_border_width(6) edit = gtk.Button(_("_Edit")) edit.connect("clicked", self.editDevice) - buttonbar.pack_start(edit, gtk.FALSE) - devhbox.pack_start(buttonbar, gtk.FALSE) + buttonbar.pack_start(edit, False) + devhbox.pack_start(buttonbar, False) devhbox.set_border_width(12) l = gtk.Label() @@ -535,31 +535,31 @@ class NetworkWindow(InstallWindow): frame.set_label_widget(l) frame.add(devhbox) frame.set_shadow_type(gtk.SHADOW_NONE) - box.pack_start(frame, gtk.FALSE) + box.pack_start(frame, False) # show hostname and dns/misc network info and offer chance to modify hostbox = gtk.HBox() hostbox=gtk.VBox() label=gtk.Label(_("Set the hostname:")) label.set_alignment(0.0, 0.0) - hostbox.pack_start(label, gtk.FALSE, gtk.FALSE) + hostbox.pack_start(label, False, False) tmphbox=gtk.HBox() self.hostnameUseDHCP = gtk.RadioButton(label=_("_automatically via DHCP")) self.hostnameUseDHCP.connect("toggled", self.hostnameUseDHCPCB, None) - tmphbox.pack_start(self.hostnameUseDHCP, gtk.FALSE, gtk.FALSE, padding=15) - hostbox.pack_start(tmphbox, gtk.FALSE, gtk.FALSE, padding=5) + tmphbox.pack_start(self.hostnameUseDHCP, False, False, padding=15) + hostbox.pack_start(tmphbox, False, False, padding=5) self.hostnameManual = gtk.RadioButton(group=self.hostnameUseDHCP, label=_("_manually")) tmphbox=gtk.HBox() - tmphbox.pack_start(self.hostnameManual, gtk.FALSE, gtk.FALSE, padding=15) + tmphbox.pack_start(self.hostnameManual, False, False, padding=15) self.hostnameEntry = gtk.Entry() - tmphbox.pack_start(self.hostnameEntry, gtk.FALSE, gtk.FALSE, padding=5) - tmphbox.pack_start(gtk.Label(_('(ex. "host.domain.com")')), gtk.FALSE, gtk.FALSE, padding=0) + tmphbox.pack_start(self.hostnameEntry, False, False, padding=5) + tmphbox.pack_start(gtk.Label(_('(ex. "host.domain.com")')), False, False, padding=0) self.hostnameManual.connect("toggled", self.hostnameManualCB, None) - hostbox.pack_start(tmphbox, gtk.FALSE, gtk.FALSE, padding=5) + hostbox.pack_start(tmphbox, False, False, padding=5) hostbox.set_border_width(12) l = gtk.Label() @@ -568,7 +568,7 @@ class NetworkWindow(InstallWindow): frame.set_label_widget(l) frame.add(hostbox) frame.set_shadow_type(gtk.SHADOW_NONE) - box.pack_start(frame, gtk.FALSE, gtk.FALSE) + box.pack_start(frame, False, False) self.setHostOptionsSensitivity() @@ -580,7 +580,7 @@ class NetworkWindow(InstallWindow): options = {} for i in range(len(global_options)): label = gtk.Label("%s:" %(global_option_labels[i],)) - label.set_property("use-underline", gtk.TRUE) + label.set_property("use-underline", True) label.set_alignment(0.0, 0.0) self.ipTable.attach(label, 0, 1, i, i+1, gtk.FILL, 0) align = gtk.Alignment(0, 0.5) @@ -620,7 +620,7 @@ class NetworkWindow(InstallWindow): frame.set_label_widget(l) frame.add(self.ipTable) frame.set_shadow_type(gtk.SHADOW_NONE) - box.pack_start(frame, gtk.FALSE, gtk.FALSE, 5) + box.pack_start(frame, False, False, 5) box.set_border_width(6) self.hostnameEntry.set_sensitive(not self.hostnameUseDHCP.get_active()) diff --git a/iw/osbootwidget.py b/iw/osbootwidget.py index c926b66b6..af8bc8e65 100644 --- a/iw/osbootwidget.py +++ b/iw/osbootwidget.py @@ -39,7 +39,7 @@ class OSBootWidget: self.setIllegalChars() - self.vbox = gtk.VBox(gtk.FALSE, 5) + self.vbox = gtk.VBox(False, 5) label = gui.WrappingLabel(_("You can configure the boot loader to boot other operating systems. " "It will allow you to select an operating system to boot from the list. " "To add additional operating systems, which are not automatically " @@ -47,18 +47,18 @@ class OSBootWidget: "select 'Default' by the desired operating system.")) label.set_alignment(0.0, 0.0) label.set_size_request(350, -1) - self.vbox.pack_start(label, gtk.FALSE) + self.vbox.pack_start(label, False) spacer = gtk.Label("") spacer.set_size_request(10, 1) - self.vbox.pack_start(spacer, gtk.FALSE) + self.vbox.pack_start(spacer, False) - box = gtk.HBox (gtk.FALSE, 5) + box = gtk.HBox (False, 5) sw = gtk.ScrolledWindow() sw.set_shadow_type(gtk.SHADOW_ETCHED_IN) sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) sw.set_size_request(300, 100) - box.pack_start(sw, gtk.TRUE) + box.pack_start(sw, True) self.osStore = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, @@ -77,10 +77,10 @@ class OSBootWidget: renderer = gtk.CellRendererText() column = gtk.TreeViewColumn(columnTitle, renderer, text = theColumns.index(columnTitle)) - column.set_clickable(gtk.FALSE) + column.set_clickable(False) self.osTreeView.append_column(column) - self.osTreeView.set_headers_visible(gtk.TRUE) + self.osTreeView.set_headers_visible(True) self.osTreeView.columns_autosize() self.osTreeView.set_size_request(100, 100) sw.add(self.osTreeView) @@ -94,19 +94,19 @@ class OSBootWidget: buttonbar.set_layout(gtk.BUTTONBOX_START) buttonbar.set_border_width(5) add = gtk.Button(_("_Add")) - buttonbar.pack_start(add, gtk.FALSE) + buttonbar.pack_start(add, False) add.connect("clicked", self.addEntry) edit = gtk.Button(_("_Edit")) - buttonbar.pack_start(edit, gtk.FALSE) + buttonbar.pack_start(edit, False) edit.connect("clicked", self.editEntry) delete = gtk.Button(_("_Delete")) - buttonbar.pack_start(delete, gtk.FALSE) + buttonbar.pack_start(delete, False) delete.connect("clicked", self.deleteEntry) - box.pack_start(buttonbar, gtk.FALSE) + box.pack_start(buttonbar, False) - self.vbox.pack_start(box, gtk.FALSE) + self.vbox.pack_start(box, False) alignment = gtk.Alignment() alignment.set(0.1, 0, 0, 0) @@ -143,7 +143,7 @@ class OSBootWidget: spacer = gtk.Label("") spacer.set_size_request(10, 1) - dialog.vbox.pack_start(spacer, gtk.FALSE) + dialog.vbox.pack_start(spacer, False) table = gtk.Table(2, 5) table.set_row_spacings(5) @@ -191,12 +191,12 @@ class OSBootWidget: default = gtk.CheckButton(_("Default Boot _Target")) table.attach(default, 0, 2, 3, 4, gtk.FILL, 0, 10) if isDefault != 0: - default.set_active(gtk.TRUE) + default.set_active(True) if self.numentries == 1 and oldDevice != None: - default.set_sensitive(gtk.FALSE) + default.set_sensitive(False) else: - default.set_sensitive(gtk.TRUE) + default.set_sensitive(True) dialog.vbox.pack_start(table) dialog.show_all() @@ -380,9 +380,9 @@ class OSBootWidget: self.osStore.set_value(iter, 2, "/dev/%s" % (dev,)) self.osStore.set_value(iter, 3, isRoot) if self.defaultDev == dev: - self.osStore.set_value(iter, 0, gtk.TRUE) + self.osStore.set_value(iter, 0, True) else: - self.osStore.set_value(iter, 0, gtk.FALSE) + self.osStore.set_value(iter, 0, False) self.numentries = len(keys) diff --git a/iw/package_gui.py b/iw/package_gui.py index 1f09329a2..9c017cfbf 100644 --- a/iw/package_gui.py +++ b/iw/package_gui.py @@ -137,12 +137,12 @@ class IndividualPackageSelectionWindow (InstallWindow): self.packageList.clear() if not self.flat_groups.has_key(currentGroup): - self.selectAllButton.set_sensitive(gtk.FALSE) - self.unselectAllButton.set_sensitive(gtk.FALSE) + self.selectAllButton.set_sensitive(False) + self.unselectAllButton.set_sensitive(False) return - self.selectAllButton.set_sensitive(gtk.TRUE) - self.unselectAllButton.set_sensitive(gtk.TRUE) + self.selectAllButton.set_sensitive(True) + self.unselectAllButton.set_sensitive(True) packages = self.flat_groups[currentGroup] self.add_packages(packages) @@ -299,7 +299,7 @@ class IndividualPackageSelectionWindow (InstallWindow): if self.ignoreKeypress: if (package, val) == self.ignoreKeypress: self.ignoreKeypress = None - return gtk.TRUE + return True else: # didnt match for some reason, lets plow ahead self.ignoreKeypress = None @@ -312,9 +312,9 @@ class IndividualPackageSelectionWindow (InstallWindow): self.pkgs[package].unselect() self.updateSize() - return gtk.TRUE + return True - return gtk.FALSE + return False # IndividualPackageSelectionWindow tag="sel-indiv" @@ -327,11 +327,11 @@ class IndividualPackageSelectionWindow (InstallWindow): renderer = gtk.CellRendererText() column = gtk.TreeViewColumn('Groups', renderer, text=0) - column.set_clickable(gtk.TRUE) + column.set_clickable(True) self.packageTreeView.append_column(column) - self.packageTreeView.set_headers_visible(gtk.FALSE) - self.packageTreeView.set_rules_hint(gtk.FALSE) - self.packageTreeView.set_enable_search(gtk.FALSE) + self.packageTreeView.set_headers_visible(False) + self.packageTreeView.set_rules_hint(False) + self.packageTreeView.set_enable_search(False) self.flat_groups = self.make_group_list(grpset) self.build_packagelists(self.flat_groups) @@ -349,7 +349,7 @@ class IndividualPackageSelectionWindow (InstallWindow): packageHBox = gtk.HBox() - self.leftVBox = gtk.VBox(gtk.FALSE) + self.leftVBox = gtk.VBox(False) # FIXME should these stay or go? # tree/flat radio buttons... @@ -359,30 +359,30 @@ class IndividualPackageSelectionWindow (InstallWindow): self.flatRadio = gtk.RadioButton(self.treeRadio, (_("_Flat View"))) optionHBox.pack_start(self.treeRadio) optionHBox.pack_start(self.flatRadio) - self.leftVBox.pack_start(optionHBox, gtk.FALSE) + self.leftVBox.pack_start(optionHBox, False) - self.leftVBox.pack_start(self.sw, gtk.TRUE) - packageHBox.pack_start(self.leftVBox, gtk.FALSE) + self.leftVBox.pack_start(self.sw, True) + packageHBox.pack_start(self.leftVBox, False) self.packageList = PackageCheckList(2) self.packageList.checkboxrenderer.connect("toggled", self.toggled_package) - self.packageList.set_enable_search(gtk.TRUE) + self.packageList.set_enable_search(True) self.sortType = "Package" self.packageList.set_column_title (1, (_("_Package"))) self.packageList.set_column_sizing (1, gtk.TREE_VIEW_COLUMN_GROW_ONLY) self.packageList.set_column_title (2, (_("_Size (MB)"))) self.packageList.set_column_sizing (2, gtk.TREE_VIEW_COLUMN_GROW_ONLY) - self.packageList.set_headers_visible(gtk.TRUE) + self.packageList.set_headers_visible(True) self.packageList.set_column_min_width(0, 16) - self.packageList.set_column_clickable(0, gtk.FALSE) + self.packageList.set_column_clickable(0, False) - self.packageList.set_column_clickable(1, gtk.TRUE) + self.packageList.set_column_clickable(1, True) self.packageList.set_column_sort_id(1, 1) - self.packageList.set_column_clickable(2, gtk.TRUE) + self.packageList.set_column_clickable(2, True) self.packageList.set_column_sort_id(2, 2) sort_id = 1 @@ -418,29 +418,29 @@ class IndividualPackageSelectionWindow (InstallWindow): packageHBox.pack_start (self.packageListSW) descVBox = gtk.VBox () - descVBox.pack_start (gtk.HSeparator (), gtk.FALSE, padding=2) + descVBox.pack_start (gtk.HSeparator (), False, padding=2) hbox = gtk.HBox () bb = gtk.HButtonBox () bb.set_layout (gtk.BUTTONBOX_END) self.totalSizeLabel = gtk.Label (_("Total size: ")) - hbox.pack_start (self.totalSizeLabel, gtk.FALSE, gtk.FALSE, 0) + hbox.pack_start (self.totalSizeLabel, False, False, 0) self.selectAllButton = gtk.Button (_("Select _all in group")) - bb.pack_start (self.selectAllButton, gtk.FALSE) + bb.pack_start (self.selectAllButton, False) self.selectAllButton.connect ('clicked', self.select_all, 1) self.unselectAllButton = gtk.Button(_("_Unselect all in group")) - bb.pack_start(self.unselectAllButton, gtk.FALSE) + bb.pack_start(self.unselectAllButton, False) self.unselectAllButton.connect ('clicked', self.select_all, 0) hbox.pack_start (bb) - self.selectAllButton.set_sensitive (gtk.FALSE) - self.unselectAllButton.set_sensitive (gtk.FALSE) + self.selectAllButton.set_sensitive (False) + self.unselectAllButton.set_sensitive (False) - descVBox.pack_start (hbox, gtk.FALSE) + descVBox.pack_start (hbox, False) descSW = gtk.ScrolledWindow () descSW.set_border_width (5) @@ -451,8 +451,8 @@ class IndividualPackageSelectionWindow (InstallWindow): buffer = gtk.TextBuffer(None) self.packageDesc.set_buffer(buffer) - self.packageDesc.set_editable(gtk.FALSE) - self.packageDesc.set_cursor_visible(gtk.FALSE) + self.packageDesc.set_editable(False) + self.packageDesc.set_cursor_visible(False) self.packageDesc.set_wrap_mode(gtk.WRAP_WORD) descSW.add (self.packageDesc) descSW.set_size_request (-1, 100) @@ -461,7 +461,7 @@ class IndividualPackageSelectionWindow (InstallWindow): vbox = gtk.VBox () vbox.pack_start (packageHBox) - vbox.pack_start (descVBox, gtk.FALSE) + vbox.pack_start (descVBox, False) self.updateSize() @@ -475,7 +475,7 @@ class PackageSelectionWindow (InstallWindow): InstallWindow.__init__ (self, ics) self.ics = ics self.ics.setNextEnabled (1) - self.files_found = "gtk.FALSE" + self.files_found = "False" def getPrev (self): self.grpset.setSelectionState(self.origSelection) @@ -745,27 +745,27 @@ class PackageSelectionWindow (InstallWindow): mainvbox = self.dialog.vbox - lblhbox = gtk.HBox(gtk.FALSE) + lblhbox = gtk.HBox(False) lbl = gtk.Label(_("A package group can have both Base and " "Optional package members. Base packages " "are always selected as long as the package group " "is selected.\n\nSelect the optional packages " "to be installed:")) - lbl.set_line_wrap(gtk.TRUE) + lbl.set_line_wrap(True) lbl.set_size_request(475, -1) lbl.set_alignment(0.0, 0.5) - lblhbox.pack_start(lbl, gtk.TRUE, gtk.TRUE) + lblhbox.pack_start(lbl, True, True) pix = gui.readImageFromFile("package-selection.png") if pix is not None: al = gtk.Alignment(0.0, 0.0) al.add(pix) - lblhbox.pack_start(al, gtk.FALSE, gtk.FALSE) + lblhbox.pack_start(al, False, False) - mainvbox.pack_start(lblhbox, gtk.FALSE, gtk.FALSE) + mainvbox.pack_start(lblhbox, False, False) - cbvbox = gtk.VBox(gtk.FALSE) + cbvbox = gtk.VBox(False) cbvbox.set_border_width(5) # will pack this last, need to create it for toggle callback below @@ -785,7 +785,7 @@ class PackageSelectionWindow (InstallWindow): lbl = gtk.Label("") lbl.set_markup("<b>%s</b>" % (_("Base Packages"),)) lbl.set_alignment(0.0, 0.0) - cbvbox.pack_start(lbl, gtk.FALSE, gtk.FALSE); + cbvbox.pack_start(lbl, False, False); while 1: next = getNextMember(goodpkgs, comp, domandatory = 1) if next is None: @@ -795,27 +795,27 @@ class PackageSelectionWindow (InstallWindow): desc = getDescription(next, comp) lbl = gtk.Label(desc) lbl.set_alignment(0.0, 0.0) - lbl.set_property("use-underline", gtk.FALSE) + lbl.set_property("use-underline", False) - thbox = gtk.HBox(gtk.FALSE) - chbox = gtk.HBox(gtk.FALSE) + thbox = gtk.HBox(False) + chbox = gtk.HBox(False) chbox.set_size_request(10,-1) - thbox.pack_start(chbox, gtk.FALSE, gtk.FALSE) - thbox.pack_start(lbl, gtk.TRUE, gtk.TRUE) + thbox.pack_start(chbox, False, False) + thbox.pack_start(lbl, True, True) - cbvbox.pack_start(thbox, gtk.FALSE, gtk.FALSE) + cbvbox.pack_start(thbox, False, False) # now the optional parts, if any next = getNextMember(goodpkgs, comp, domandatory = 0) if next is not None: spacer = gtk.Fixed() spacer.set_size_request(-1, 10) - cbvbox.pack_start(spacer, gtk.FALSE, gtk.FALSE) + cbvbox.pack_start(spacer, False, False) lbl = gtk.Label("") lbl.set_markup("<b>%s</b>" % (_("Optional Packages"),)) lbl.set_alignment(0.0, 0.0) - cbvbox.pack_start(lbl, gtk.FALSE, gtk.FALSE) + cbvbox.pack_start(lbl, False, False) while 1: next = getNextMember(goodpkgs, comp, domandatory = 0) if next is None: @@ -826,7 +826,7 @@ class PackageSelectionWindow (InstallWindow): desc = getDescription(next, comp) lbl = gtk.Label(desc) lbl.set_alignment(0.0, 0.0) - lbl.set_property("use-underline", gtk.FALSE) + lbl.set_property("use-underline", False) cb = gtk.CheckButton() cb.add(lbl) (ptype, sel) = comp.packageInfo()[next] @@ -834,19 +834,19 @@ class PackageSelectionWindow (InstallWindow): cb.connect("toggled", self.pkgGroupMemberToggled, (comp, sizeLabel, next)) - thbox = gtk.HBox(gtk.FALSE) - chbox = gtk.HBox(gtk.FALSE) + thbox = gtk.HBox(False) + chbox = gtk.HBox(False) chbox.set_size_request(10,-1) - thbox.pack_start(chbox, gtk.FALSE, gtk.FALSE) - thbox.pack_start(cb, gtk.TRUE, gtk.TRUE) + thbox.pack_start(chbox, False, False) + thbox.pack_start(cb, True, True) - cbvbox.pack_start(thbox, gtk.FALSE, gtk.FALSE) + cbvbox.pack_start(thbox, False, False) sw = gtk.ScrolledWindow() sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - wrapper = gtk.VBox (gtk.FALSE, 0) - wrapper.pack_start (cbvbox, gtk.FALSE) + wrapper = gtk.VBox (False, 0) + wrapper.pack_start (cbvbox, False) sw.add_with_viewport (wrapper) viewport = sw.get_children()[0] @@ -855,9 +855,9 @@ class PackageSelectionWindow (InstallWindow): cbvbox.set_focus_hadjustment(sw.get_hadjustment ()) cbvbox.set_focus_vadjustment(sw.get_vadjustment ()) - mainvbox.pack_start(sw, gtk.TRUE, gtk.TRUE, 10) + mainvbox.pack_start(sw, True, True, 10) - mainvbox.pack_start(sizeLabel, gtk.FALSE, gtk.FALSE) + mainvbox.pack_start(sizeLabel, False, False) self.dialog.set_size_request(550, 420) self.dialog.show_all() @@ -935,7 +935,7 @@ class PackageSelectionWindow (InstallWindow): (parlist, pardict) = orderPackageGroups(self.grpset) - topbox = gtk.VBox(gtk.FALSE, 3) + topbox = gtk.VBox(False, 3) topbox.set_border_width(3) checkGroup = gtk.SizeGroup(gtk.SIZE_GROUP_BOTH) @@ -980,11 +980,11 @@ class PackageSelectionWindow (InstallWindow): height = ICON_SIZE, width = ICON_SIZE) - compbox = gtk.HBox(gtk.FALSE, 5) + compbox = gtk.HBox(False, 5) spacer = gtk.Fixed() spacer.set_size_request(30, -1) - compbox.pack_start(spacer, gtk.FALSE, gtk.FALSE) + compbox.pack_start(spacer, False, False) # create check button and edit button # make the comps title + edit button @@ -1001,15 +1001,15 @@ class PackageSelectionWindow (InstallWindow): count.set_alignment (1.0, 0.5) self.setCompCountLabel(comp, count) countGroup.add_widget(count) - compbox.pack_start(count, gtk.FALSE, gtk.FALSE) + compbox.pack_start(count, False, False) spacer = gtk.Fixed() spacer.set_size_request(15, -1) - compbox.pack_start(spacer, gtk.FALSE, gtk.FALSE) + compbox.pack_start(spacer, False, False) buttonal = gtk.Alignment(0.5, 0.5) detailGroup.add_widget(buttonal) - compbox.pack_start(buttonal, gtk.FALSE, gtk.FALSE) + compbox.pack_start(buttonal, False, False) # now make the url looking button for details if comp.id != "everything" and comp.id != "base": @@ -1029,24 +1029,24 @@ class PackageSelectionWindow (InstallWindow): topbox.pack_start(compbox) - detailbox = gtk.HBox(gtk.FALSE) + detailbox = gtk.HBox(False) spacer = gtk.Fixed() spacer.set_size_request(45, -1) - detailbox.pack_start(spacer, gtk.FALSE, gtk.FALSE) + detailbox.pack_start(spacer, False, False) # icon if pix is not None: al = gtk.Alignment(0.5, 0.5) al.add(pix) - detailbox.pack_start(al, gtk.FALSE, gtk.FALSE, 10) + detailbox.pack_start(al, False, False, 10) # add description if it exists descr = getGroupDescription(comp) if descr is not None: label=gtk.Label("") label.set_alignment (0.0, 0.0) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) if gtk.gdk.screen_width() > 640: wraplen = 350 @@ -1055,7 +1055,7 @@ class PackageSelectionWindow (InstallWindow): label.set_size_request(wraplen, -1) label.set_markup("%s" % (_(descr),)) - detailbox.pack_start(label, gtk.TRUE) + detailbox.pack_start(label, True) topbox.pack_start(detailbox) state = self.setCheckButtonState(checkButton, comp) @@ -1076,7 +1076,7 @@ class PackageSelectionWindow (InstallWindow): # add some extra space to the end of each group spacer = gtk.Fixed() spacer.set_size_request(-1, 3) - topbox.pack_start(spacer, gtk.FALSE, gtk.FALSE) + topbox.pack_start(spacer, False, False) # hack to make everything and minimal act right sw = gtk.ScrolledWindow() @@ -1107,21 +1107,21 @@ class PackageSelectionWindow (InstallWindow): self.idleid = gobject.idle_add(self.focusIdleHandler, None) # pack rest of screen - hbox = gtk.HBox (gtk.FALSE, 5) + hbox = gtk.HBox (False, 5) self.individualPackages = gtk.CheckButton ( _("_Select individual packages")) self.individualPackages.set_active ( not dispatch.stepInSkipList("indivpackage")) -# hbox.pack_start (self.individualPackages, gtk.FALSE) +# hbox.pack_start (self.individualPackages, False) self.sizelabel = gtk.Label ("") self.setSize() - hbox.pack_start (self.sizelabel, gtk.TRUE) + hbox.pack_start (self.sizelabel, True) - vbox = gtk.VBox (gtk.FALSE, 5) - vbox.pack_start (sw, gtk.TRUE) - vbox.pack_start (hbox, gtk.FALSE) + vbox = gtk.VBox (False, 5) + vbox.pack_start (sw, True) + vbox.pack_start (hbox, False) vbox.set_border_width (5) return vbox @@ -1132,12 +1132,12 @@ class PackageCheckList(checklist.CheckList): def create_columns(self, columns): renderer = gtk.CellRendererText() column = gtk.TreeViewColumn('Text', renderer, text = 1) - column.set_clickable(gtk.FALSE) + column.set_clickable(False) self.append_column(column) renderer = gtk.CellRendererText() column = gtk.TreeViewColumn('Size', renderer, text = 2) - column.set_clickable(gtk.FALSE) + column.set_clickable(False) self.append_column(column) def __init__(self, columns = 2): diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py index 2b8a117f4..9e3317def 100644 --- a/iw/partition_dialog_gui.py +++ b/iw/partition_dialog_gui.py @@ -67,7 +67,7 @@ class PartitionEditor: maxsizeAdj = gtk.Adjustment(value = 1, lower = 1, upper = MAX_PART_SIZE, step_incr = 1) fillmaxszsb = gtk.SpinButton(maxsizeAdj, digits = 0) - fillmaxszsb.set_property('numeric', gtk.TRUE) + fillmaxszsb.set_property('numeric', True) fillmaxszhbox = gtk.HBox() fillmaxszhbox.pack_start(fillmaxszrb) fillmaxszhbox.pack_start(fillmaxszsb) @@ -116,7 +116,7 @@ class PartitionEditor: request = copy.copy(self.origrequest) request.fstype = filesystem - request.format = gtk.TRUE + request.format = True if request.fstype.isMountable(): request.mountpoint = self.mountCombo.get_children()[0].get_text() @@ -124,12 +124,12 @@ class PartitionEditor: request.mountpoint = None if self.primonlycheckbutton.get_active(): - primonly = gtk.TRUE + primonly = True else: primonly = None if self.badblocks and self.badblocks.get_active(): - request.badblocks = gtk.TRUE + request.badblocks = True else: request.badblocks = None @@ -137,7 +137,7 @@ class PartitionEditor: if self.fixedrb.get_active(): grow = None else: - grow = gtk.TRUE + grow = True self.sizespin.update() @@ -205,7 +205,7 @@ class PartitionEditor: if request.format: request.fstype = self.fsoptionsDict["fstypeCombo"].get_active_value() if self.fsoptionsDict.has_key("badblocks") and self.fsoptionsDict["badblocks"].get_active(): - request.badblocks = gtk.TRUE + request.badblocks = True else: request.badblocks = None else: @@ -369,7 +369,7 @@ class PartitionEditor: sizeAdj = gtk.Adjustment(value = 1, lower = 1, upper = MAX_PART_SIZE, step_incr = 1) self.sizespin = gtk.SpinButton(sizeAdj, digits = 0) - self.sizespin.set_property('numeric', gtk.TRUE) + self.sizespin.set_property('numeric', True) if self.origrequest.size: self.sizespin.set_value(self.origrequest.size) @@ -396,7 +396,7 @@ class PartitionEditor: upper=maxcyl, step_incr=1) self.startcylspin = gtk.SpinButton(cylAdj, digits=0) - self.startcylspin.set_property('numeric', gtk.TRUE) + self.startcylspin.set_property('numeric', True) lbl.set_mnemonic_widget(self.startcylspin) maintable.attach(self.startcylspin, 1, 2, row, row + 1) row = row + 1 @@ -408,7 +408,7 @@ class PartitionEditor: lbl = createAlignedLabel(_("_End Cylinder:")) maintable.attach(lbl, 0, 1, row, row + 1) self.endcylspin = gtk.SpinButton(endcylAdj, digits = 0) - self.endcylspin.set_property('numeric', gtk.TRUE) + self.endcylspin.set_property('numeric', True) lbl.set_mnemonic_widget(self.endcylspin) maintable.attach(self.endcylspin, 1, 2, row, row + 1) diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 1047d1f5f..11a22f232 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -92,7 +92,7 @@ class DiskStripeSlice: elif event.type == gtk.gdk._2BUTTON_PRESS: self.editCb() - return gtk.TRUE + return True def shutDown(self): self.parent = None @@ -171,7 +171,7 @@ class DiskStripeSlice: outline_color='black', width_units=1.0) self.text.set(x=2.0, y=texty + 2.0, text=self.sliceText(), fill_color='black', - anchor=gtk.ANCHOR_NW, clip=gtk.TRUE, + anchor=gtk.ANCHOR_NW, clip=True, clip_width=xlength-1, clip_height=yheight-1) self.hideOrShowText() @@ -447,15 +447,15 @@ class DiskTreeModel(gtk.TreeStore): rowpart = None if rowpart == partition: path = self.get_path(parent) - self.view.expand_row(path, gtk.TRUE) + self.view.expand_row(path, True) selection = self.view.get_selection() if selection is not None: selection.unselect_all() selection.select_iter(iter) path = self.get_path(iter) col = self.view.get_column(0) - self.view.set_cursor(path, col, gtk.FALSE) - self.view.scroll_to_cell(path, col, gtk.TRUE, 0.5, 0.5) + self.view.set_cursor(path, col, False) + self.view.scroll_to_cell(path, col, True, 0.5, 0.5) return # if this is a parent node, and it didn't point to the partition # we're looking for, get the first child and iter over them @@ -537,7 +537,7 @@ class PartitionWindow(InstallWindow): def __init__(self, ics): InstallWindow.__init__(self, ics) ics.setTitle(_("Partitioning")) - ics.setNextEnabled(gtk.TRUE) + ics.setNextEnabled(True) ics.readHTML("partition") self.parent = ics.getICW().window @@ -575,17 +575,17 @@ class PartitionWindow(InstallWindow): image = gtk.Image() image.set_from_stock('gtk-dialog-warning', gtk.ICON_SIZE_DIALOG) - hbox = gtk.HBox(gtk.FALSE, 9) + hbox = gtk.HBox(False, 9) al=gtk.Alignment(0.0, 0.0) al.add(image) - hbox.pack_start(al, gtk.FALSE) + hbox.pack_start(al, False) buffer = gtk.TextBuffer(None) buffer.set_text(comments) text = gtk.TextView() text.set_buffer(buffer) - text.set_property("editable", gtk.FALSE) - text.set_property("cursor_visible", gtk.FALSE) + text.set_property("editable", False) + text.set_property("cursor_visible", False) text.set_wrap_mode(gtk.WRAP_WORD) sw = gtk.ScrolledWindow() @@ -595,26 +595,26 @@ class PartitionWindow(InstallWindow): sw.set_shadow_type(gtk.SHADOW_IN) info1 = gtk.Label(labelstr1) - info1.set_line_wrap(gtk.TRUE) + info1.set_line_wrap(True) info1.set_size_request(400, -1) info2 = gtk.Label(labelstr2) - info2.set_line_wrap(gtk.TRUE) + info2.set_line_wrap(True) info2.set_size_request(400, -1) - vbox = gtk.VBox(gtk.FALSE, 9) + vbox = gtk.VBox(False, 9) al=gtk.Alignment(0.0, 0.0) al.add(info1) - vbox.pack_start(al, gtk.FALSE) + vbox.pack_start(al, False) - vbox.pack_start(sw, gtk.TRUE, gtk.TRUE) + vbox.pack_start(sw, True, True) al=gtk.Alignment(0.0, 0.0) al.add(info2) - vbox.pack_start(al, gtk.TRUE) + vbox.pack_start(al, True) - hbox.pack_start(vbox, gtk.TRUE, gtk.TRUE) + hbox.pack_start(vbox, True, True) win.vbox.pack_start(hbox) win.set_position(gtk.WIN_POS_CENTER) @@ -738,7 +738,7 @@ class PartitionWindow(InstallWindow): if lvrequest.format: self.tree[iter]['Format'] = self.checkmark_pixbuf self.tree[iter]['IsFormattable'] = lvrequest.fstype.isFormattable() - self.tree[iter]['IsLeaf'] = gtk.TRUE + self.tree[iter]['IsLeaf'] = True self.tree[iter]['Type'] = ptype self.tree[iter]['Start'] = "" self.tree[iter]['End'] = "" @@ -776,14 +776,14 @@ class PartitionWindow(InstallWindow): self.tree[iter]['IsFormattable'] = request.fstype.isFormattable() else: ptype = _("None") - self.tree[iter]['IsFormattable'] = gtk.FALSE + self.tree[iter]['IsFormattable'] = False try: device = "/dev/md%d" % (request.raidminor,) except: device = "Auto" - self.tree[iter]['IsLeaf'] = gtk.TRUE + self.tree[iter]['IsLeaf'] = True self.tree[iter]['Device'] = device self.tree[iter]['Type'] = ptype self.tree[iter]['Start'] = "" @@ -833,10 +833,10 @@ class PartitionWindow(InstallWindow): raise RuntimeError, ("crossed logical partition " "before extended") iter = self.tree.append(extendedParent) - self.tree[iter]['IsLeaf'] = gtk.TRUE + self.tree[iter]['IsLeaf'] = True else: iter = self.tree.append(parent) - self.tree[iter]['IsLeaf'] = gtk.TRUE + self.tree[iter]['IsLeaf'] = True if request and request.mountpoint: self.tree[iter]['Mount Point'] = request.mountpoint @@ -1258,18 +1258,18 @@ class PartitionWindow(InstallWindow): row = row + 1 newminor = availminors[0] - radioBox = gtk.VBox (gtk.FALSE) + radioBox = gtk.VBox (False) createRAIDpart = gtk.RadioButton(None, _("Create a software RAID _partition.")) - radioBox.pack_start(createRAIDpart, gtk.FALSE, gtk.FALSE, padding=10) + radioBox.pack_start(createRAIDpart, False, False, padding=10) createRAIDdev = gtk.RadioButton(createRAIDpart, _("Create a RAID _device [default=/dev/md%s].") % newminor) - radioBox.pack_start(createRAIDdev, gtk.FALSE, gtk.FALSE, padding=10) + radioBox.pack_start(createRAIDdev, False, False, padding=10) doRAIDclone = gtk.RadioButton(createRAIDpart, _("Clone a _drive to create a " "RAID device [default=/dev/md%s].") % newminor) - radioBox.pack_start(doRAIDclone, gtk.FALSE, gtk.FALSE, padding=10) + radioBox.pack_start(doRAIDclone, False, False, padding=10) createRAIDpart.set_active(1) doRAIDclone.set_sensitive(0) @@ -1345,7 +1345,7 @@ class PartitionWindow(InstallWindow): # self.newFsset = self.fsset.copy() # load up checkmark - self.checkmark_pixbuf = gtk.gdk.pixbuf_new_from_inline(len(new_checkmark), new_checkmark, gtk.FALSE) + self.checkmark_pixbuf = gtk.gdk.pixbuf_new_from_inline(len(new_checkmark), new_checkmark, False) # operational buttons buttonBox = gtk.HButtonBox() @@ -1388,19 +1388,19 @@ class PartitionWindow(InstallWindow): frame.add(sw) vpaned.add1(frame) - box = gtk.VBox(gtk.FALSE, 5) - box.pack_start(buttonBox, gtk.FALSE) + box = gtk.VBox(False, 5) + box.pack_start(buttonBox, False) sw = gtk.ScrolledWindow() sw.add(self.treeView) sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) sw.set_shadow_type(gtk.SHADOW_IN) - box.pack_start(sw, gtk.TRUE) + box.pack_start(sw, True) self.toggleViewButton = gtk.CheckButton(_("Hide RAID device/LVM Volume _Group members")) self.toggleViewButton.set_active(not self.show_uneditable) self.toggleViewButton.connect("toggled", self.viewButtonCB) - box.pack_start(self.toggleViewButton, gtk.FALSE, gtk.FALSE) + box.pack_start(self.toggleViewButton, False, False) vpaned.add2(box) @@ -1413,7 +1413,7 @@ class AutoPartitionWindow(InstallWindow): def __init__(self, ics): InstallWindow.__init__(self, ics) ics.setTitle(_("Automatic Partitioning")) - ics.setNextEnabled(gtk.TRUE) + ics.setNextEnabled(True) ics.readHTML("autopart") self.parent = ics.getICW().window @@ -1473,29 +1473,29 @@ class AutoPartitionWindow(InstallWindow): type = partitions.autoClearPartType cleardrives = partitions.autoClearPartDrives - box = gtk.VBox(gtk.FALSE) + box = gtk.VBox(False) box.set_border_width(5) label = gui.WrappingLabel(_(autopart.AUTOPART_DISK_CHOICE_DESCR_TEXT)) label.set_alignment(0.0, 0.0) - box.pack_start(label, gtk.FALSE, gtk.FALSE) + box.pack_start(label, False, False) # what partition types to remove - clearbox = gtk.VBox(gtk.FALSE) + clearbox = gtk.VBox(False) label = gui.WrappingLabel(_("I want to have automatic partitioning:")) label.set_alignment(0.0, 0.0) - clearbox.pack_start(label, gtk.FALSE, gtk.FALSE, 10) + clearbox.pack_start(label, False, False, 10) - radioBox = gtk.VBox(gtk.FALSE) + radioBox = gtk.VBox(False) self.clearLinuxRB = gtk.RadioButton( None, _(autopart.CLEARPART_TYPE_LINUX_DESCR_TEXT)) - radioBox.pack_start(self.clearLinuxRB, gtk.FALSE, gtk.FALSE) + radioBox.pack_start(self.clearLinuxRB, False, False) self.clearAllRB = gtk.RadioButton( self.clearLinuxRB, _(autopart.CLEARPART_TYPE_ALL_DESCR_TEXT)) - radioBox.pack_start(self.clearAllRB, gtk.FALSE, gtk.FALSE) + radioBox.pack_start(self.clearAllRB, False, False) self.clearNoneRB = gtk.RadioButton( self.clearLinuxRB, _(autopart.CLEARPART_TYPE_NONE_DESCR_TEXT)) - radioBox.pack_start(self.clearNoneRB, gtk.FALSE, gtk.FALSE) + radioBox.pack_start(self.clearNoneRB, False, False) if type == autopart.CLEARPART_TYPE_LINUX: self.clearLinuxRB.set_active(1) @@ -1507,16 +1507,16 @@ class AutoPartitionWindow(InstallWindow): align = gtk.Alignment() align.add(radioBox) align.set(0.5, 0.5, 0.0, 0.0) - clearbox.pack_start(align, gtk.FALSE, gtk.FALSE) + clearbox.pack_start(align, False, False) - box.pack_start(clearbox, gtk.FALSE, gtk.FALSE, 10) + box.pack_start(clearbox, False, False, 10) # which drives to use? - drivesbox = gtk.VBox(gtk.FALSE) + drivesbox = gtk.VBox(False) label = gui.WrappingLabel(_("Select the drive(s) to use for " "this installation:")) label.set_alignment(0.0, 0.0) - drivesbox.pack_start(label, gtk.FALSE, gtk.FALSE, 10) + drivesbox.pack_start(label, False, False, 10) self.drivelist = createAllowedDrivesList(diskset.disks, cleardrives) # XXX bad use of usize @@ -1531,25 +1531,25 @@ class AutoPartitionWindow(InstallWindow): align.add(sw) align.set(0.5, 0.5, 0.0, 0.0) - drivesbox.pack_start(align, gtk.FALSE, gtk.FALSE) + drivesbox.pack_start(align, False, False) - box.pack_start(drivesbox, gtk.FALSE, gtk.FALSE) + box.pack_start(drivesbox, False, False) self.inspect = gtk.CheckButton() gui.widgetExpander(self.inspect) label = gui.MnemonicLabel(_("Re_view (and modify if needed) " "the partitions created")) label.set_mnemonic_widget(self.inspect) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) gui.widgetExpander(label, self.inspect) label.set_alignment(0.0, 1.0) self.inspect.add(label) self.inspect.set_active(not dispatch.stepInSkipList("partition")) - box.pack_start(self.inspect, gtk.TRUE, gtk.TRUE, 10) + box.pack_start(self.inspect, True, True, 10) - self.ics.setNextEnabled(gtk.TRUE) + self.ics.setNextEnabled(True) align = gtk.Alignment() align.add(box) diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py index 82aeb47da..382fc6328 100644 --- a/iw/partition_ui_helpers_gui.py +++ b/iw/partition_ui_helpers_gui.py @@ -32,11 +32,11 @@ from rhpl.translate import _, N_ class WideCheckList(checklist.CheckList): def toggled_item(self, data, row): - rc = gtk.TRUE + rc = True if self.clickCB: rc = self.clickCB(data, row) - if rc == gtk.TRUE: + if rc == True: checklist.CheckList.toggled_item(self, data, row) @@ -57,7 +57,7 @@ class WideCheckList(checklist.CheckList): def createAlignedLabel(text): label = gtk.Label(text) label.set_alignment(0.0, 0.5) - label.set_property("use-underline", gtk.TRUE) + label.set_property("use-underline", True) return label diff --git a/iw/partmethod_gui.py b/iw/partmethod_gui.py index 28b999b07..d7805a1fa 100644 --- a/iw/partmethod_gui.py +++ b/iw/partmethod_gui.py @@ -39,22 +39,22 @@ class PartitionMethodWindow(InstallWindow): self.partitions = partitions - box = gtk.VBox (gtk.FALSE) + box = gtk.VBox (False) box.set_border_width (5) label=WrappingLabel(_(PARTMETHOD_TYPE_DESCR_TEXT)) label.set_alignment(0.0, 0.0) - box.pack_start(label, gtk.TRUE, gtk.TRUE) + box.pack_start(label, True, True) - radioBox = gtk.VBox (gtk.FALSE) + radioBox = gtk.VBox (False) self.useAuto = gtk.RadioButton( None, _("_Automatically partition")) - radioBox.pack_start(self.useAuto, gtk.FALSE, gtk.FALSE) + radioBox.pack_start(self.useAuto, False, False) self.useDS = gtk.RadioButton( self.useAuto, _("Manually partition with _Disk Druid")) - radioBox.pack_start(self.useDS, gtk.FALSE, gtk.FALSE) + radioBox.pack_start(self.useDS, False, False) if partitions.useAutopartitioning: self.useAuto.set_active(1) @@ -65,11 +65,11 @@ class PartitionMethodWindow(InstallWindow): align.add(radioBox) align.set(0.5, 0.5, 0.0, 0.0) - box.pack_start(align, gtk.FALSE, gtk.FALSE, 10) + box.pack_start(align, False, False, 10) box.set_border_width (5) - self.ics.setNextEnabled (gtk.TRUE) + self.ics.setNextEnabled (True) align = gtk.Alignment() align.add(box) diff --git a/iw/pixmapRadioButtonGroup_gui.py b/iw/pixmapRadioButtonGroup_gui.py index d7f91f4b3..66e7ace83 100644 --- a/iw/pixmapRadioButtonGroup_gui.py +++ b/iw/pixmapRadioButtonGroup_gui.py @@ -37,28 +37,28 @@ class pixmapRadioButtonGroup: def pixRadioButton (self, group, labelstr, pixmap, description=None): pix = pixmap - hbox = gtk.HBox (gtk.FALSE, 18) + hbox = gtk.HBox (False, 18) if pix != None: - hbox.pack_start (pix, gtk.TRUE, gtk.TRUE, 0) + hbox.pack_start (pix, True, True, 0) label = gtk.Label("") - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_markup("<b>"+labelstr+"</b>") label.set_alignment (0.0, 0.5) if description is not None: label.set_markup ("<b>%s</b>\n<small>%s</small>" %(labelstr, description)) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) if gtk.gdk.screen_width() > 640: wraplen = 350 else: wraplen = 250 label.set_size_request(wraplen, -1) - label.set_use_markup (gtk.TRUE) - label.set_use_underline(gtk.TRUE) + label.set_use_markup (True) + label.set_use_underline(True) - hbox.pack_start (label, gtk.TRUE, gtk.TRUE, 0) + hbox.pack_start (label, True, True, 0) button = gtk.RadioButton (group) button.add (hbox) label.set_mnemonic_widget(button) @@ -122,7 +122,7 @@ class pixmapRadioButtonGroup: radioGroup = None buttons = [] for item in self.entries: - box = gtk.VBox (gtk.FALSE, 9) + box = gtk.VBox (False, 9) name = item["name"] label = item["label"] pixmap = item["pixmap"] @@ -135,23 +135,23 @@ class pixmapRadioButtonGroup: self.topLevelButtonList.append((radioGroup, box, buttons)) radioGroup.connect("toggled", self.toggled) - finalVBox = gtk.VBox(gtk.FALSE, 18) + finalVBox = gtk.VBox(False, 18) finalVBox.set_border_width (5) for (button, box, buttons) in self.topLevelButtonList: - vbox = gtk.VBox (gtk.FALSE, 9) - finalVBox.pack_start(vbox, gtk.FALSE, gtk.FALSE) - vbox.pack_start (button, gtk.FALSE, gtk.FALSE) + vbox = gtk.VBox (False, 9) + finalVBox.pack_start(vbox, False, False) + vbox.pack_start (button, False, False) if box: - tmphbox = gtk.HBox(gtk.FALSE) + tmphbox = gtk.HBox(False) - crackhbox = gtk.HBox(gtk.FALSE) + crackhbox = gtk.HBox(False) crackhbox.set_size_request(50, -1) - tmphbox.pack_start(crackhbox, gtk.FALSE, gtk.FALSE) - tmphbox.pack_start(box, gtk.TRUE, gtk.TRUE) - vbox.pack_start(tmphbox, gtk.FALSE, gtk.FALSE) + tmphbox.pack_start(crackhbox, False, False) + tmphbox.pack_start(box, True, True) + vbox.pack_start(tmphbox, False, False) return finalVBox @@ -171,7 +171,7 @@ if __name__ == "__main__": source = gtk.IconSource() source.set_pixbuf(pixbuf) source.set_size(gtk.ICON_SIZE_DIALOG) - source.set_size_wildcarded(gtk.FALSE) + source.set_size_wildcarded(False) iconset = gtk.IconSet() iconset.add_source(source) p = gtk.image_new_from_icon_set(iconset, gtk.ICON_SIZE_DIALOG) @@ -202,7 +202,7 @@ if __name__ == "__main__": item.show() upgradeoptionmenu.add(item) - upboxtmp = gtk.VBox(gtk.FALSE, 5) + upboxtmp = gtk.VBox(False, 5) l = gtk.Label(label) l.set_alignment(0.0, 0.0) upboxtmp.pack_start(l) @@ -212,13 +212,13 @@ if __name__ == "__main__": upgradeoption.set_sensitive(0) # hack indent it - upbox = gtk.HBox(gtk.FALSE) + upbox = gtk.HBox(False) - crackhbox = gtk.HBox(gtk.FALSE) + crackhbox = gtk.HBox(False) crackhbox.set_size_request(80, -1) - upbox.pack_start(crackhbox, gtk.FALSE, gtk.FALSE) - upbox.pack_start(upboxtmp, gtk.TRUE, gtk.TRUE) + upbox.pack_start(crackhbox, False, False) + upbox.pack_start(upboxtmp, True, True) r = pixmapRadioButtonGroup() r.addEntry("upgrade", "_Upgrade Existing Installation", pixmap=readPixmap("/usr/share/anaconda/pixmaps/upgrade.png"), descr="Choose this option if you would like to upgrade your existing %s system. This option will preserve the data on your drive" % (productName,), userdata="data") @@ -231,11 +231,11 @@ if __name__ == "__main__": r.packWidgetInEntry("Upgrade Existing Installation", upbox) vbox = gtk.VBox() - vbox.pack_start(b, gtk.FALSE, gtk.FALSE) + vbox.pack_start(b, False, False) button = gtk.Button("Quit") button.connect("pressed", nowquit) - vbox.pack_start(button, gtk.FALSE, gtk.FALSE) + vbox.pack_start(button, False, False) win.add(vbox) win.show_all() diff --git a/iw/progress_gui.py b/iw/progress_gui.py index 28d1e3f5b..921530384 100644 --- a/iw/progress_gui.py +++ b/iw/progress_gui.py @@ -56,10 +56,10 @@ class InstallProgressWindow_NEW (InstallWindow): def __init__ (self, ics): InstallWindow.__init__ (self, ics) - ics.setPrevEnabled (gtk.FALSE) - ics.setNextEnabled (gtk.FALSE) + ics.setPrevEnabled (False) + ics.setNextEnabled (False) - ics.setHelpButtonEnabled (gtk.FALSE) + ics.setHelpButtonEnabled (False) self.numComplete = 0 self.sizeComplete = 0 @@ -311,7 +311,7 @@ class InstallProgressWindow_NEW (InstallWindow): # self.timeLog = open("/tmp/timelog", "w") # Create vbox to contain components of UI - vbox = gtk.VBox (gtk.FALSE, 10) + vbox = gtk.VBox (False, 10) # Create rnote area pix = gui.readImageFromFile ("progress_first.png") @@ -329,7 +329,7 @@ class InstallProgressWindow_NEW (InstallWindow): self.progress = gtk.ProgressBar () self.totalProgress = gtk.ProgressBar () - progressTable = gtk.Table (2, 2, gtk.FALSE) + progressTable = gtk.Table (2, 2, False) progressTable.attach (self.totalProgress, 1, 2, 0, 1, ypadding=2) # label = gtk.Label (_("Package Progress: ")) @@ -337,16 +337,16 @@ class InstallProgressWindow_NEW (InstallWindow): # progressTable.attach (label, 0, 1, 1, 2, gtk.SHRINK) # progressTable.attach (self.progress, 1, 2, 1, 2, ypadding=2) - vbox.pack_start (progressTable, gtk.FALSE) + vbox.pack_start (progressTable, False) # total time remaining self.remainingTimeLabel = gtk.Label("") self.remainingTimeLabel.set_alignment(0.5, 0.5) - vbox.pack_start(self.remainingTimeLabel, gtk.FALSE, gtk.FALSE) + vbox.pack_start(self.remainingTimeLabel, False, False) # Create table for current package info table = gtk.Table (3, 1) - vbox.pack_start (table, gtk.FALSE, gtk.FALSE) + vbox.pack_start (table, False, False) self.curPackage = { "package" : _("Package"), "summary" : _("Summary") } @@ -355,7 +355,7 @@ class InstallProgressWindow_NEW (InstallWindow): for key in ("package", "summary"): label = gtk.Label ("") label.set_alignment (0, 0) - label.set_line_wrap (gtk.TRUE) + label.set_line_wrap (True) if key == "summary": label.set_text ("\n\n") label.set_size_request(450, 35) @@ -374,11 +374,11 @@ class InstallProgressWindow_NEW (InstallWindow): break if statusflag: - statusTable = gtk.Table (2, 2, gtk.FALSE) + statusTable = gtk.Table (2, 2, False) self.pkgstatus = gtk.Label("") statusTable.attach (gtk.Label(_("Status: ")), 0, 1, 0, 1, gtk.SHRINK) statusTable.attach (self.pkgstatus, 1, 2, 0, 1, gtk.FILL, gtk.FILL, ypadding=2) - vbox.pack_start (statusTable, gtk.FALSE, gtk.FALSE) + vbox.pack_start (statusTable, False, False) else: self.pkgstatus = None diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py index 695abe812..fdaa737d4 100644 --- a/iw/raid_dialog_gui.py +++ b/iw/raid_dialog_gui.py @@ -381,7 +381,7 @@ class RaidEditor: row = row + 1 if origrequest.getPreExisting(): - self.raidlist.set_sensitive(gtk.FALSE) + self.raidlist.set_sensitive(False) # number of spares - created widget above lbl = createAlignedLabel(_("Number of _spares:")) @@ -433,7 +433,7 @@ class RaidCloneDialog: iter = store.append() store.set_value(iter, 0, drive) - view.set_property("headers-visible", gtk.FALSE) + view.set_property("headers-visible", False) col = gtk.TreeViewColumn("", gtk.CellRendererText(), text=0) view.append_column(col) diff --git a/iw/release_notes_viewer_gui.py b/iw/release_notes_viewer_gui.py index 7c49e9cda..413095023 100755 --- a/iw/release_notes_viewer_gui.py +++ b/iw/release_notes_viewer_gui.py @@ -77,7 +77,7 @@ if __name__ == "__main__": if take_screenshot: width = gtk.gdk.screen_width() height = gtk.gdk.screen_height() - screenshot = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, gtk.FALSE, 8, + screenshot = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, 8, width, height) screenshot.get_from_drawable(gtk.gdk.get_default_root_window(), @@ -102,7 +102,7 @@ if __name__ == "__main__": textWin = gtk.Dialog(flags=gtk.DIALOG_MODAL) - table = gtk.Table(3, 3, gtk.FALSE) + table = gtk.Table(3, 3, False) textWin.vbox.pack_start(table) textWin.add_button('gtk-close', gtk.RESPONSE_NONE) textWin.connect("response", relnotes_closed) diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py index 32e8d7ef6..ebb22d19b 100644 --- a/iw/timezone_gui.py +++ b/iw/timezone_gui.py @@ -47,7 +47,7 @@ class TimezoneWindow(InstallWindow): else: path = "/usr/share/anaconda/pixmaps/map480.png" - mainBox = gtk.VBox(gtk.FALSE, 5) + mainBox = gtk.VBox(False, 5) zonetab = ZoneTab() self.tz = TimezoneMap(zonetab=zonetab, map=path) @@ -68,18 +68,18 @@ class TimezoneWindow(InstallWindow): self.systemUTC = gtk.CheckButton(_("System clock uses _UTC")) self.systemUTC.set_active(asUTC) - hbox = gtk.HBox(gtk.FALSE, 5) + hbox = gtk.HBox(False, 5) pix = gui.readImageFromFile("timezone.png") if pix: - hbox.pack_start(pix, gtk.FALSE) + hbox.pack_start(pix, False) - hbox.pack_start(gtk.Label(_("Please select the nearest city in your timezone:")), gtk.FALSE) - mainBox.pack_start(hbox, gtk.FALSE) - mainBox.pack_start(self.tz, gtk.TRUE, gtk.TRUE) - mainBox.pack_start(self.systemUTC, gtk.FALSE) + hbox.pack_start(gtk.Label(_("Please select the nearest city in your timezone:")), False) + mainBox.pack_start(hbox, False) + mainBox.pack_start(self.tz, True, True) + mainBox.pack_start(self.systemUTC, False) mainBox.set_border_width(5) - box = gtk.VBox(gtk.FALSE, 5) + box = gtk.VBox(False, 5) box.pack_start(mainBox) box.set_border_width(5) diff --git a/iw/timezone_map_gui.py b/iw/timezone_map_gui.py index c91e55bb5..9510515c7 100644 --- a/iw/timezone_map_gui.py +++ b/iw/timezone_map_gui.py @@ -39,7 +39,7 @@ class TimezoneMap(gtk.VBox): def __init__(self, zonetab, default="America/New_York", map='/usr/share/anaconda/pixmaps/map480.png'): - gtk.VBox.__init__(self, gtk.FALSE, 5) + gtk.VBox.__init__(self, False, 5) # set up class member objects self.zonetab = zonetab @@ -68,7 +68,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(gnomecanvas.CanvasText, text='x', fill_color='red', anchor=gtk.ANCHOR_CENTER, @@ -80,8 +80,8 @@ class TimezoneMap(gtk.VBox): self.arrow = root.add(gnomecanvas.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, @@ -90,9 +90,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.TRUE) + self.listView.set_property("headers-visible", True) col = gtk.TreeViewColumn(_("_Location"), gtk.CellRendererText(), text=0) self.listView.append_column(col) col = gtk.TreeViewColumn(_("Description"), 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) @@ -188,8 +188,8 @@ class TimezoneMap(gtk.VBox): selection.select_iter(iter) path = self.listStore.get_path(iter) col = self.listView.get_column(0) - self.listView.scroll_to_cell(path, col, gtk.TRUE, 0.5, 0.5) - self.listView.set_cursor(path, col, gtk.FALSE) + self.listView.scroll_to_cell(path, col, True, 0.5, 0.5) + self.listView.set_cursor(path, col, False) break iter = self.listStore.iter_next(iter) @@ -296,7 +296,7 @@ if __name__ == "__main__": vbox.pack_start(map) button = gtk.Button("Quit") 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() gtk.main() diff --git a/iw/upgrade_bootloader_gui.py b/iw/upgrade_bootloader_gui.py index b9ba54074..051a90112 100644 --- a/iw/upgrade_bootloader_gui.py +++ b/iw/upgrade_bootloader_gui.py @@ -74,14 +74,14 @@ class UpgradeBootloaderWindow (InstallWindow): self.bootDev) self.update_label = gtk.Label("%s %s" % (updatestr, _("This is the recommended option."))) - self.update_radio.set_active(gtk.FALSE) + self.update_radio.set_active(False) update = 1 else: current = _("The installer is unable to detect the boot loader " "currently in use on your system.") self.update_label = gtk.Label("%s" % (updatestr,)) - self.update_radio.set_sensitive(gtk.FALSE) - self.update_label.set_sensitive(gtk.FALSE) + self.update_radio.set_sensitive(False) + self.update_label.set_sensitive(False) update = 0 @@ -93,19 +93,19 @@ class UpgradeBootloaderWindow (InstallWindow): "you wish to switch boot loaders, you " "should choose this.")) - self.newbl_radio.set_active(gtk.FALSE) + self.newbl_radio.set_active(False) self.nobl_radio = gtk.RadioButton(self.update_radio, _("_Skip boot loader updating")) self.nobl_label = gtk.Label(_("This will make no changes to boot " "loader configuration. If you are " "using a third party boot loader, you " "should choose this.")) - self.nobl_radio.set_active(gtk.FALSE) + self.nobl_radio.set_active(False) for label in [self.update_label, self.nobl_label, self.newbl_label]: label.set_alignment(0.8, 0) label.set_size_request(275, -1) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) str = _("What would you like to do?") @@ -118,33 +118,33 @@ class UpgradeBootloaderWindow (InstallWindow): if not dispatch.stepInSkipList("bootloader"): - self.newbl_radio.set_active(gtk.TRUE) + self.newbl_radio.set_active(True) elif dispatch.stepInSkipList("instbootloader"): - self.nobl_radio.set_active(gtk.TRUE) + self.nobl_radio.set_active(True) else: - default.set_active(gtk.TRUE) + default.set_active(True) - box = gtk.VBox(gtk.FALSE, 5) + box = gtk.VBox(False, 5) label = gtk.Label(current) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_alignment(0.5, 0.0) label.set_size_request(300, -1) label2 = gtk.Label(str) - label2.set_line_wrap(gtk.TRUE) + label2.set_line_wrap(True) label2.set_alignment(0.5, 0.0) label2.set_size_request(300, -1) - box.pack_start(label, gtk.FALSE) - box.pack_start(label2, gtk.FALSE, padding = 10) + box.pack_start(label, False) + box.pack_start(label2, False, padding = 10) - box.pack_start(self.update_radio, gtk.FALSE) - box.pack_start(self.update_label, gtk.FALSE) - box.pack_start(self.nobl_radio, gtk.FALSE) - box.pack_start(self.nobl_label, gtk.FALSE) - box.pack_start(self.newbl_radio, gtk.FALSE) - box.pack_start(self.newbl_label, gtk.FALSE) + box.pack_start(self.update_radio, False) + box.pack_start(self.update_label, False) + box.pack_start(self.nobl_radio, False) + box.pack_start(self.nobl_label, False) + box.pack_start(self.newbl_radio, False) + box.pack_start(self.newbl_label, False) a = gtk.Alignment(0.2, 0.1) a.add(box) diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py index 502c7d4da..d63750261 100644 --- a/iw/upgrade_migratefs_gui.py +++ b/iw/upgrade_migratefs_gui.py @@ -49,7 +49,7 @@ class UpgradeMigrateFSWindow (InstallWindow): self.migent = fsset.getMigratableEntries() self.fsset = fsset - box = gtk.VBox (gtk.FALSE, 5) + box = gtk.VBox (False, 5) box.set_border_width (5) text = N_("This release of %s supports " @@ -63,10 +63,10 @@ class UpgradeMigrateFSWindow (InstallWindow): label = gtk.Label (_(text)) label.set_alignment (0.5, 0.0) label.set_size_request(400, -1) - label.set_line_wrap (gtk.TRUE) - box.pack_start(label, gtk.FALSE) + label.set_line_wrap (True) + box.pack_start(label, False) - cbox = gtk.VBox(gtk.FALSE, 5) + cbox = gtk.VBox(False, 5) self.cbs = [] for entry in self.migent: if entry.fsystem.getName() != entry.origfsystem.getName(): @@ -78,7 +78,7 @@ class UpgradeMigrateFSWindow (InstallWindow): entry.origfsystem.getName(), entry.mountpoint)) cb.set_active(migrating) - cbox.pack_start(cb, gtk.FALSE) + cbox.pack_start(cb, False) self.cbs.append((cb, entry)) @@ -93,7 +93,7 @@ class UpgradeMigrateFSWindow (InstallWindow): a = gtk.Alignment(0.25, 0.5) a.add(sw) - box.pack_start(a, gtk.TRUE) + box.pack_start(a, True) a = gtk.Alignment(0.5, 0.5) a.add(box) diff --git a/iw/upgrade_swap_gui.py b/iw/upgrade_swap_gui.py index 0ac5e6cf7..e371d4ef8 100644 --- a/iw/upgrade_swap_gui.py +++ b/iw/upgrade_swap_gui.py @@ -95,7 +95,7 @@ class UpgradeSwapWindow (InstallWindow): self.neededSwap = 1 self.row = 0 - box = gtk.VBox (gtk.FALSE, 5) + box = gtk.VBox (False, 5) box.set_border_width (5) label = gtk.Label (_("The 2.4 kernel needs significantly more " @@ -110,26 +110,26 @@ class UpgradeSwapWindow (InstallWindow): label.set_alignment (0.5, 0.0) # label.set_size_request(400, 200) - label.set_line_wrap (gtk.TRUE) - box.pack_start(label, gtk.FALSE) + label.set_line_wrap (True) + box.pack_start(label, False) hs = gtk.HSeparator() - box.pack_start(hs, gtk.FALSE) + box.pack_start(hs, False) self.option1 = gtk.RadioButton(None, (_("I _want to create a swap file"))) - box.pack_start(self.option1, gtk.FALSE) + box.pack_start(self.option1, False) (fsList, suggSize, suggMntPoint) = rc - self.swapbox = gtk.VBox(gtk.FALSE, 5) - box.pack_start(self.swapbox, gtk.FALSE) + self.swapbox = gtk.VBox(False, 5) + box.pack_start(self.swapbox, False) label = gui.MnemonicLabel (_("Select the _partition to put the swap file on:")) a = gtk.Alignment(0.2, 0.5) a.add(label) - self.swapbox.pack_start(a, gtk.FALSE) + self.swapbox.pack_start(a, False) self.store = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, @@ -157,7 +157,7 @@ class UpgradeSwapWindow (InstallWindow): sw.set_size_request(300, 90) a = gtk.Alignment(0.5, 0.5) a.add(sw) - self.swapbox.pack_start(a, gtk.FALSE, gtk.TRUE, 10) + self.swapbox.pack_start(a, False, True, 10) rootiter = self.store.get_iter_first() sel = self.view.get_selection() @@ -167,30 +167,30 @@ class UpgradeSwapWindow (InstallWindow): "least %d MB. Please enter a size for the swap " "file:") % suggSize) label.set_size_request(400, 40) - label.set_line_wrap (gtk.TRUE) + label.set_line_wrap (True) a = gtk.Alignment(0.5, 0.5) a.add(label) - self.swapbox.pack_start(a, gtk.FALSE, gtk.TRUE, 10) + self.swapbox.pack_start(a, False, True, 10) - hbox = gtk.HBox(gtk.FALSE, 5) + hbox = gtk.HBox(False, 5) a = gtk.Alignment(0.4, 0.5) a.add(hbox) - self.swapbox.pack_start(a, gtk.FALSE) + self.swapbox.pack_start(a, False) label = gui.MnemonicLabel (_("Swap file _size (MB):")) - hbox.pack_start(label, gtk.FALSE) + hbox.pack_start(label, False) self.entry = gtk.Entry(4) label.set_mnemonic_widget(self.entry) self.entry.set_size_request(40, 25) self.entry.set_text(str(suggSize)) - hbox.pack_start(self.entry, gtk.FALSE, gtk.TRUE, 10) + hbox.pack_start(self.entry, False, True, 10) self.option2 = gtk.RadioButton(self.option1, (_("I _don't want to create a swap " "file"))) - box.pack_start(self.option2, gtk.FALSE, gtk.TRUE, 20) + box.pack_start(self.option2, False, True, 20) self.option1.connect("toggled", self.toggle) return box diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index 23eeadeb8..19dc56fdf 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -39,7 +39,7 @@ unprobed_monitor_string = _("Unprobed Monitor") def makeFormattedLabel(text): label = gtk.Label (text) label.set_justify (gtk.JUSTIFY_LEFT) - label.set_line_wrap (gtk.TRUE) + label.set_line_wrap (True) label.set_alignment (0.0, 0.5) label.set_size_request (400, -1) return label @@ -52,7 +52,7 @@ class XCustomWindow (InstallWindow): def __init__ (self, ics): InstallWindow.__init__ (self, ics) - self.ics.setNextEnabled (gtk.TRUE) + self.ics.setNextEnabled (True) def getPrev(self): @@ -155,7 +155,7 @@ class XCustomWindow (InstallWindow): self.monitor_align = gtk.Alignment () self.monitor_align.add (pix) self.monitor_align.set (0.5, 0.5, 1.0, 1.0) - self.hbox.pack_start (self.monitor_align, gtk.TRUE, gtk.TRUE) + self.hbox.pack_start (self.monitor_align, True, True) self.hbox.show_all() def swap_monitor (self, num): @@ -199,7 +199,7 @@ class XCustomWindow (InstallWindow): a = gtk.Alignment () a.add (pix) a.set (0.5, 0.5, 1.0, 1.0) - self.vbox4.pack_start (a, gtk.TRUE, gtk.TRUE) + self.vbox4.pack_start (a, True, True) self.hbox4.pack_start (self.vbox4) self.hbox4.show_all () @@ -232,27 +232,27 @@ class XCustomWindow (InstallWindow): self.instPath = instPath # create toplevel packing structure - self.box = gtk.VBox (gtk.FALSE) + self.box = gtk.VBox (False) self.box.set_border_width (5) # hbox and alignment used for monitor preview area # list of pixmaps for monitor preview self.monitor_pixmaps = None - self.hbox = gtk.HBox (gtk.FALSE, 5) + self.hbox = gtk.HBox (False, 5) self.monitor_align = None self.desktop_align = None self.load_monitor_preview_pixmap("monitor.png") self.box.pack_start (self.hbox) - hbox1 = gtk.HBox (gtk.FALSE, 5) - hbox3 = gtk.HBox (gtk.FALSE, 5) - hbox4 = gtk.HBox (gtk.FALSE, 5) + hbox1 = gtk.HBox (False, 5) + hbox3 = gtk.HBox (False, 5) + hbox4 = gtk.HBox (False, 5) frame1 = gtk.Frame (_("_Color Depth:")) - frame1.get_label_widget().set_property("use-underline", gtk.TRUE) + frame1.get_label_widget().set_property("use-underline", True) frame1.set_shadow_type (gtk.SHADOW_NONE) frame1.set_border_width (10) - hbox1.pack_start(frame1, gtk.TRUE, gtk.FALSE, 0) + hbox1.pack_start(frame1, True, False, 0) # determine video modes available for this card/monitor combo self.avail_depth = self.xsetup.xhwstate.available_color_depths() @@ -280,10 +280,10 @@ class XCustomWindow (InstallWindow): # now we do screen resolution frame2 = gtk.Frame (_("_Screen Resolution:")) - frame2.get_label_widget().set_property("use-underline", gtk.TRUE) + frame2.get_label_widget().set_property("use-underline", True) frame2.set_shadow_type (gtk.SHADOW_NONE) frame2.set_border_width (10) - hbox1.pack_start (frame2, gtk.TRUE, gtk.FALSE, 2) + hbox1.pack_start (frame2, True, False, 2) self.avail_res = self.xsetup.xhwstate.available_resolutions() @@ -315,7 +315,7 @@ class XCustomWindow (InstallWindow): self.ignore_res_cb = 0 self.res_optionmenu.connect ("changed", self.res_cb) - self.box.pack_start (hbox1, gtk.FALSE) + self.box.pack_start (hbox1, False) #--If both KDE and GNOME are selected if grpset: @@ -340,7 +340,7 @@ class XCustomWindow (InstallWindow): frame3 = gtk.Frame (_("Your desktop environment is:")) frame3.set_shadow_type (gtk.SHADOW_NONE) - hbox3.pack_start (frame3, gtk.TRUE, gtk.FALSE, 2) + hbox3.pack_start (frame3, True, False, 2) self.hbox4 = gtk.HBox () frame3.add (self.hbox4) @@ -353,9 +353,9 @@ class XCustomWindow (InstallWindow): vbox3 = gtk.VBox() gnome_radio = gtk.RadioButton (None, (_("GNO_ME"))) - vbox3.pack_start (gnome_radio, gtk.TRUE, gtk.FALSE, 2) + vbox3.pack_start (gnome_radio, True, False, 2) kde_radio = gtk.RadioButton(gnome_radio, (_("_KDE"))) - vbox3.pack_start (kde_radio, gtk.TRUE, gtk.FALSE, 2) + vbox3.pack_start (kde_radio, True, False, 2) self.hbox4.pack_start (vbox3) @@ -363,10 +363,10 @@ class XCustomWindow (InstallWindow): #--Set the desktop GUI widget to what the user has selected if self.origDesktop == "GNOME": - gnome_radio.set_active (gtk.TRUE) + gnome_radio.set_active (True) self.display_desktop_pixmap("GNOME") elif self.origDesktop == "KDE": - kde_radio.set_active (gtk.TRUE) + kde_radio.set_active (True) self.display_desktop_pixmap("KDE") gnome_radio.connect ("clicked", self.desktop_cb, "GNOME") @@ -375,7 +375,7 @@ class XCustomWindow (InstallWindow): self.hbox4.pack_start(gtk.Label(self.origDesktop)) self.display_desktop_pixmap(self.origDesktop) - self.box.pack_start (hbox3, gtk.FALSE, gtk.TRUE, 2) + self.box.pack_start (hbox3, False, True, 2) else: gnome_radio = None kde_radio = None @@ -387,9 +387,9 @@ class XCustomWindow (InstallWindow): if self.instClass.showLoginChoice: frame4 = gtk.Frame (_("Please choose your login type:")) frame4.set_shadow_type (gtk.SHADOW_NONE) - hbox4.pack_start (frame4, gtk.TRUE, gtk.FALSE, 2) + hbox4.pack_start (frame4, True, False, 2) - self.hbox5 = gtk.HBox (gtk.TRUE, 2) + self.hbox5 = gtk.HBox (True, 2) frame4.add (self.hbox5) self.text = gtk.RadioButton (None, (_("_Text"))) @@ -398,14 +398,14 @@ class XCustomWindow (InstallWindow): self.runLevel = self.desktop.getDefaultRunLevel() if self.runLevel == 3: - self.text.set_active (gtk.TRUE) + self.text.set_active (True) elif self.runLevel == 5: - self.graphical.set_active (gtk.TRUE) + self.graphical.set_active (True) - self.hbox5.pack_start (self.graphical, gtk.FALSE, 2) - self.hbox5.pack_start (self.text, gtk.FALSE, 2) + self.hbox5.pack_start (self.graphical, False, 2) + self.hbox5.pack_start (self.text, False, 2) - self.box.pack_start (hbox4, gtk.FALSE, gtk.TRUE, 2) + self.box.pack_start (hbox4, False, True, 2) return self.box @@ -415,8 +415,8 @@ class MonitorWindow (InstallWindow): def __init__ (self, ics): InstallWindow.__init__ (self, ics) - self.ics.setNextEnabled (gtk.FALSE) - self.ics.setPrevEnabled (gtk.TRUE) + self.ics.setNextEnabled (False) + self.ics.setPrevEnabled (True) def getNext (self): if self.currentMonitor: @@ -476,9 +476,9 @@ class MonitorWindow (InstallWindow): aval = entry.get_text() bval = other.get_text() if isValidSyncRange(aval) and isValidSyncRange(bval): - self.ics.setNextEnabled (gtk.TRUE) + self.ics.setNextEnabled (True) else: - self.ics.setNextEnabled (gtk.FALSE) + self.ics.setNextEnabled (False) def setCurrent(self, monitorname, recenter=1): self.ignoreEvents = 1 @@ -497,15 +497,15 @@ class MonitorWindow (InstallWindow): # if it's not a parent node and the mouse matches, select it. elif self.monitorstore.get_value(iter, 0) == monitorname: path = self.monitorstore.get_path(parent) - self.monitorview.expand_row(path, gtk.TRUE) + self.monitorview.expand_row(path, True) selection = self.monitorview.get_selection() selection.unselect_all() selection.select_iter(iter) path = self.monitorstore.get_path(iter) col = self.monitorview.get_column(0) - self.monitorview.set_cursor(path, col, gtk.FALSE) + self.monitorview.set_cursor(path, col, False) if recenter: - self.monitorview.scroll_to_cell(path, col, gtk.TRUE, + self.monitorview.scroll_to_cell(path, col, True, 0.0, 0.5) break # get the next row. @@ -620,14 +620,14 @@ class MonitorWindow (InstallWindow): self.lastvalidselection = None - box = gtk.VBox (gtk.FALSE, 5) + box = gtk.VBox (False, 5) label = makeFormattedLabel (_("In most cases, the monitor can be " "automatically detected. If the " "detected settings are not correct " "for the monitor, select the right " "settings.")) - box.pack_start (label, gtk.FALSE) + box.pack_start (label, False) # Monitor selection tree self.monitorstore = gtk.TreeStore(gobject.TYPE_STRING, @@ -716,7 +716,7 @@ class MonitorWindow (InstallWindow): self.currentMonitor = amonitor[0] self.monitorview = gtk.TreeView(self.monitorstore) - self.monitorview.set_property("headers-visible", gtk.FALSE) + self.monitorview.set_property("headers-visible", False) col = gtk.TreeViewColumn(None, gtk.CellRendererText(), text=0) self.monitorview.append_column(col) @@ -724,7 +724,7 @@ class MonitorWindow (InstallWindow): sw.add (self.monitorview) sw.set_policy (gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) sw.set_shadow_type(gtk.SHADOW_IN) - box.pack_start (sw, gtk.TRUE, gtk.TRUE) + box.pack_start (sw, True, True) self.setCurrent(self.currentMonitor) selection = self.monitorview.get_selection() @@ -744,7 +744,7 @@ class MonitorWindow (InstallWindow): align = gtk.Alignment (1, 0.5) align.add (self.reset) - synctable = gtk.Table(2, 4, gtk.FALSE) + synctable = gtk.Table(2, 4, False) hlabel = gui.MnemonicLabel (_("Hori_zontal Sync:")) hlabel.set_alignment (0, 0.5) hlabel.set_mnemonic_widget(self.hEntry) @@ -769,7 +769,7 @@ class MonitorWindow (InstallWindow): synctable.attach(khz, 2, 3, 1, 2, gtk.FILL, gtk.FILL, 5) synctable.attach(align, 3, 4, 1, 2) - box.pack_start (synctable, gtk.FALSE, gtk.FALSE) + box.pack_start (synctable, False, False) setupTreeViewFixupIdleHandler(self.monitorview, self.monitorstore) @@ -782,7 +782,7 @@ class XConfigWindow (InstallWindow): def __init__ (self, ics): InstallWindow.__init__ (self, ics) - ics.setPrevEnabled (gtk.FALSE) + ics.setPrevEnabled (False) self.ics = ics def getNext (self): @@ -918,15 +918,15 @@ class XConfigWindow (InstallWindow): # if it's not a parent node and the mouse matches, select it. elif self.cardstore.get_value(iter, 0) == cardname: path = self.cardstore.get_path(parent) - self.cardview.expand_row(path, gtk.TRUE) + self.cardview.expand_row(path, True) selection = self.cardview.get_selection() selection.unselect_all() selection.select_iter(iter) path = self.cardstore.get_path(iter) col = self.cardview.get_column(0) - self.cardview.set_cursor(path, col, gtk.FALSE) + self.cardview.set_cursor(path, col, False) if recenter: - self.cardview.scroll_to_cell(path, col, gtk.TRUE, + self.cardview.scroll_to_cell(path, col, True, 0.0, 0.5) break # get the next row. @@ -952,7 +952,7 @@ class XConfigWindow (InstallWindow): # XConfigWindow tag="xconf" def getScreen (self, dispatch, xsetup, videocard, intf): - self.ics.setHelpEnabled (gtk.TRUE) + self.ics.setHelpEnabled (True) self.dispatch = dispatch self.videocard = videocard @@ -961,10 +961,10 @@ class XConfigWindow (InstallWindow): self.lastvalidselection = None - box = gtk.VBox (gtk.FALSE, 0) + box = gtk.VBox (False, 0) box.set_border_width (0) - self.autoBox = gtk.VBox (gtk.FALSE, 5) + self.autoBox = gtk.VBox (False, 5) self.force_ppc_fb = 0 arch = iutil.getArch() @@ -977,24 +977,24 @@ class XConfigWindow (InstallWindow): "not want to setup the X Window " "System, choose " "'Skip X Configuration' below.")) - box.pack_start (label, gtk.FALSE, gtk.FALSE) + box.pack_start (label, False, False) self.force_ppc_fb = 1 elif arch != "i386": label = makeFormattedLabel (_("Your video ram size can not be " "autodetected. Choose your video " "ram size from the choices below:")) - box.pack_start (label, gtk.FALSE) + box.pack_start (label, False) else: - self.autoBox = gtk.VBox (gtk.FALSE, 5) + self.autoBox = gtk.VBox (False, 5) label = makeFormattedLabel (_("In most cases, the video hardware " "can be automatically detected. " "If the detected settings are not " "correct for the hardware, select " "the right settings.")) - self.autoBox.pack_start (label, gtk.FALSE) + self.autoBox.pack_start (label, False) - box.pack_start (self.autoBox, gtk.FALSE) + box.pack_start (self.autoBox, False) # load in card database self.cards = self.videocard.cardsDB() @@ -1055,7 +1055,7 @@ class XConfigWindow (InstallWindow): self.cardstore.set_value(iter, 0, card) self.cardview = gtk.TreeView(self.cardstore) - self.cardview.set_property("headers-visible", gtk.FALSE) + self.cardview.set_property("headers-visible", False) col = gtk.TreeViewColumn(None, gtk.CellRendererText(), text=0) self.cardview.append_column(col) selection = self.cardview.get_selection() @@ -1069,7 +1069,7 @@ class XConfigWindow (InstallWindow): # only show this option on non-ppc if not self.force_ppc_fb: - box.pack_start (sw, gtk.TRUE) + box.pack_start (sw, True) #Memory configuration menu hbox = gtk.HBox() @@ -1091,33 +1091,33 @@ class XConfigWindow (InstallWindow): memitem = gtk.MenuItem(tag) self.ramMenu.add(memitem) - hbox.pack_start(label, gtk.FALSE) - hbox.pack_start(self.ramOption, gtk.TRUE, gtk.TRUE, 25) + hbox.pack_start(label, False) + hbox.pack_start(self.ramOption, True, True, 25) self.ramOption.set_menu (self.ramMenu) # only show this option on non-ppc if not self.force_ppc_fb: - box.pack_start (hbox, gtk.FALSE) + box.pack_start (hbox, False) restore = gtk.Button (_("Restore _original values")) restore.connect ("clicked", self.restorePressed) - hbox.pack_start(restore, gtk.FALSE, 25) + hbox.pack_start(restore, False, 25) self.skip = gtk.CheckButton (_("_Skip X configuration")) self.skip.connect ("toggled", self.skipToggled) - hbox = gtk.HBox (gtk.TRUE, 5) + hbox = gtk.HBox (True, 5) - self.topbox = gtk.VBox (gtk.FALSE, 5) + self.topbox = gtk.VBox (False, 5) self.topbox.set_border_width (5) if self.force_ppc_fb: # tweak packing - self.topbox.pack_start (box, gtk.FALSE, gtk.FALSE) - self.topbox.pack_start (self.skip, gtk.FALSE, gtk.FALSE) + self.topbox.pack_start (box, False, False) + self.topbox.pack_start (self.skip, False, False) else: - self.topbox.pack_start (box, gtk.TRUE, gtk.TRUE) - self.topbox.pack_start (self.skip, gtk.FALSE) + self.topbox.pack_start (box, True, True) + self.topbox.pack_start (self.skip, False) self.configbox = box diff --git a/iw/zfcp_gui.py b/iw/zfcp_gui.py index 3b930e5b7..dfa48721c 100644 --- a/iw/zfcp_gui.py +++ b/iw/zfcp_gui.py @@ -50,7 +50,7 @@ class ZFCPWindow(InstallWindow): if self.options[i][1] == 1: renderer = gtk.CellRendererText() column = gtk.TreeViewColumn(self.options[i][0], renderer, text=i) - column.set_clickable(gtk.FALSE) + column.set_clickable(False) column.set_min_width(140) column.set_sizing (gtk.TREE_VIEW_COLUMN_AUTOSIZE) self.view.append_column(column) @@ -74,13 +74,13 @@ class ZFCPWindow(InstallWindow): self.diskset = diskset self.intf = intf self.options = fcp.options - box = gtk.VBox(gtk.FALSE) + box = gtk.VBox(False) box.set_border_width(6) fcp.cleanFcpSysfs(fcp.fcpdevices) self.fcp = fcp self.fcpdevices = copy.copy(fcp.fcpdevices) - devvbox = gtk.VBox(gtk.FALSE) + devvbox = gtk.VBox(False) self.devlist = self.setupDevices() @@ -90,21 +90,21 @@ class ZFCPWindow(InstallWindow): devlistSW.set_shadow_type(gtk.SHADOW_IN) devlistSW.add(self.devlist) devlistSW.set_size_request(-1, 350) - devvbox.pack_start(devlistSW, gtk.FALSE, padding=10) + devvbox.pack_start(devlistSW, False, padding=10) buttonbar = gtk.HButtonBox() buttonbar.set_layout(gtk.BUTTONBOX_START) buttonbar.set_border_width(6) add = gtk.Button(_("_Add")) add.connect("clicked", self.addDevice) - buttonbar.pack_start(add, gtk.FALSE) + buttonbar.pack_start(add, False) edit = gtk.Button(_("_Edit")) edit.connect("clicked", self.editDevice) - buttonbar.pack_start(edit, gtk.FALSE) + buttonbar.pack_start(edit, False) remove = gtk.Button(_("_Remove")) remove.connect("clicked", self.removeDevice) - buttonbar.pack_start(remove, gtk.FALSE) - devvbox.pack_start(buttonbar, gtk.FALSE) + buttonbar.pack_start(remove, False) + devvbox.pack_start(buttonbar, False) devvbox.set_border_width(12) l = gtk.Label() @@ -113,7 +113,7 @@ class ZFCPWindow(InstallWindow): frame.set_label_widget(l) frame.add(devvbox) frame.set_shadow_type(gtk.SHADOW_NONE) - box.pack_start(frame, gtk.FALSE) + box.pack_start(frame, False) return box def addDevice(self, data): @@ -122,7 +122,7 @@ class ZFCPWindow(InstallWindow): addWin = gtk.Dialog(_("Add FCP device"), flags=gtk.DIALOG_MODAL) gui.addFrame(addWin) - addWin.set_modal(gtk.TRUE) + addWin.set_modal(True) addWin.set_position (gtk.WIN_POS_CENTER) devbox = gtk.VBox() fcpTable = gtk.Table(len(self.options), 2) @@ -130,12 +130,12 @@ class ZFCPWindow(InstallWindow): for t in range(len(self.options)): label = gtk.Label("%s:" %(self.options[t][0],)) label.set_alignment(0.0, 0.5) - label.set_property("use-underline", gtk.TRUE) + label.set_property("use-underline", True) fcpTable.attach(label, 0, 1, t, t+1, gtk.FILL, 0, 10) entrys[t] = gtk.Entry(18) fcpTable.attach(entrys[t], 1, 2, t, t+1, gtk.FILL, 0, 10) - devbox.pack_start(fcpTable, gtk.FALSE, gtk.FALSE, 6) + devbox.pack_start(fcpTable, False, False, 6) devbox.set_border_width(6) frame = gtk.Frame() frame.set_border_width(12) @@ -185,7 +185,7 @@ class ZFCPWindow(InstallWindow): editWin = gtk.Dialog(_("Edit FCP device %s") % (devicenum,), flags=gtk.DIALOG_MODAL) gui.addFrame(editWin) - editWin.set_modal(gtk.TRUE) + editWin.set_modal(True) editWin.set_position (gtk.WIN_POS_CENTER) devbox = gtk.VBox() fcpTable = gtk.Table(len(self.options), 2) @@ -193,12 +193,12 @@ class ZFCPWindow(InstallWindow): for t in range(len(self.options)): label = gtk.Label("%s:" %(self.options[t][0],)) label.set_alignment(0.0, 0.5) - label.set_property("use-underline", gtk.TRUE) + label.set_property("use-underline", True) fcpTable.attach(label, 0, 1, t, t+1, gtk.FILL, 0, 10) entrys[t] = gtk.Entry(18) entrys[t].set_text(model.get_value(iter, t)) fcpTable.attach(entrys[t], 1, 2, t, t+1, gtk.FILL, 0, 10) - devbox.pack_start(fcpTable, gtk.FALSE, gtk.FALSE, 6) + devbox.pack_start(fcpTable, False, False, 6) devbox.set_border_width(6) frame = gtk.Frame() frame.set_border_width(12) diff --git a/iw/zipl_gui.py b/iw/zipl_gui.py index f76897dbb..3d57996ef 100644 --- a/iw/zipl_gui.py +++ b/iw/zipl_gui.py @@ -69,7 +69,7 @@ class ZiplWindow (InstallWindow): defaultDevice = bl.images.getDefault() self.ignoreSignals = 0 - box = gtk.VBox(gtk.FALSE, 5) + box = gtk.VBox(False, 5) box.set_border_width(5) label = gtk.Label(_("The z/IPL boot loader will be installed on your " @@ -94,12 +94,12 @@ class ZiplWindow (InstallWindow): "You can now enter any additional kernel parameters " "which your machine or your setup may require.")) label.set_size_request(500, -1) - label.set_line_wrap(gtk.TRUE) + label.set_line_wrap(True) label.set_alignment(0.0, 0.0) label.set_padding(50,50) - box.pack_start(label, gtk.FALSE) + box.pack_start(label, False) - box.pack_start (gtk.HSeparator (), gtk.FALSE) + box.pack_start (gtk.HSeparator (), False) label = gtk.Label(_("Kernel Parameters") + ":") label.set_alignment(0.0, 0.5) @@ -130,17 +130,17 @@ class ZiplWindow (InstallWindow): self.chandeventry1.set_text(cdevs[0]) if len(cdevs) > 1: self.chandeventry2.set_text(string.join(cdevs[1:],';')) - hbox = gtk.HBox(gtk.FALSE, 5) - hbox.pack_start(label, gtk.FALSE) + hbox = gtk.HBox(False, 5) + hbox.pack_start(label, False) hbox.pack_start(self.kernelEntry) - box.pack_start(hbox, gtk.FALSE) - hbox1 = gtk.HBox(gtk.FALSE, 5) - hbox1.pack_start(clabel1, gtk.FALSE) + box.pack_start(hbox, False) + hbox1 = gtk.HBox(False, 5) + hbox1.pack_start(clabel1, False) hbox1.pack_start(self.chandeventry1) - box.pack_start(hbox1, gtk.FALSE) - hbox2 = gtk.HBox(gtk.FALSE, 5) - hbox2.pack_start(clabel2, gtk.FALSE) + box.pack_start(hbox1, False) + hbox2 = gtk.HBox(False, 5) + hbox2.pack_start(clabel2, False) hbox2.pack_start(self.chandeventry2) - box.pack_start(hbox2, gtk.FALSE) + box.pack_start(hbox2, False) return box |