--- system-config-nfs-1.3.5/src/mainWindow.py~ 2005-04-01 14:31:44.285344928 +1000 +++ system-config-nfs-1.3.5/src/mainWindow.py 2005-04-01 14:32:02.018649056 +1000 @@ -54,7 +54,7 @@ class mainWindow: gtk.main_quit () else: gtk.mainquit() - return gtk.TRUE + return True def __init__(self): if os.access ("system-config-nfs.glade", os.F_OK): @@ -107,25 +107,25 @@ class mainWindow: self.xml.signal_connect ('on_addButton_clicked', self.on_addButton_clicked) #image, label = button.get_children()[0].get_children() #label.set_text(_("_Add")) - #label.set_use_underline(gtk.TRUE) + #label.set_use_underline(True) self.propertiesButton = self.xml.get_widget ("propertiesButton") self.xml.signal_connect ('on_propertiesButton_clicked', self.on_propertiesButton_clicked) #image, label = self.propertiesButton.get_children()[0].get_children() #label.set_text(_("_Properties")) - #label.set_use_underline(gtk.TRUE) + #label.set_use_underline(True) self.deleteButton = self.xml.get_widget ("deleteButton") self.xml.signal_connect ('on_deleteButton_clicked', self.on_deleteButton_clicked) #image, label = self.deleteButton.get_children()[0].get_children() #label.set_text(_("_Delete")) - #label.set_use_underline(gtk.TRUE) + #label.set_use_underline(True) self.helpButton = self.xml.get_widget ("helpButton") self.xml.signal_connect ('on_helpButton_clicked', self.on_helpButton_clicked) - self.propertiesButton.set_sensitive(gtk.FALSE) - self.deleteButton.set_sensitive(gtk.FALSE) + self.propertiesButton.set_sensitive(False) + self.deleteButton.set_sensitive(False) self.exports = nfsExports.nfsExports () self.exports.consolidateShares () @@ -146,7 +146,7 @@ class mainWindow: #self.mainWindow.set_size_request(600, 500) self.selectedRow = -1 - self.changed = gtk.FALSE + self.changed = False self.createHandler = None self.modifyHandler = None @@ -198,30 +198,30 @@ class mainWindow: def on_exportsList_select_row(self, *args): store, iter = self.exportsView.get_selection().get_selected() if iter: - self.propertiesButton.set_sensitive(gtk.TRUE) - self.deleteButton.set_sensitive(gtk.TRUE) - self.propertiesMenu.set_sensitive(gtk.TRUE) - self.deleteMenu.set_sensitive(gtk.TRUE) + self.propertiesButton.set_sensitive(True) + self.deleteButton.set_sensitive(True) + self.propertiesMenu.set_sensitive(True) + self.deleteMenu.set_sensitive(True) else: - self.propertiesButton.set_sensitive(gtk.FALSE) - self.deleteButton.set_sensitive(gtk.FALSE) - self.propertiesMenu.set_sensitive(gtk.FALSE) - self.deleteMenu.set_sensitive(gtk.FALSE) + self.propertiesButton.set_sensitive(False) + self.deleteButton.set_sensitive(False) + self.propertiesMenu.set_sensitive(False) + self.deleteMenu.set_sensitive(False) def on_addButton_clicked(self, *args): - self.changed = gtk.TRUE + self.changed = True self.propWindow.new_share (_("Add NFS Share")) self.desensitizeWidgets () def on_propertiesButton_clicked(self, *args): - self.changed = gtk.TRUE + self.changed = True store, iter = self.exportsView.get_selection().get_selected() if iter != None: self.propWindow.edit_share(_("Edit NFS Share"), iter) self.desensitizeWidgets() def on_deleteButton_clicked(self, *args): - self.changed = gtk.TRUE + self.changed = True store, iter = self.exportsView.get_selection().get_selected() if iter != None: @@ -233,7 +233,7 @@ class mainWindow: self.apply_changes() def apply_changes(self, *args): - self.changed = gtk.TRUE + self.changed = True #Pass the list of data into writeFile self.exports.writeFile() @@ -242,10 +242,10 @@ class mainWindow: def desensitizeWidgets(self, *args): self.exportsView.get_selection().unselect_all() - self.propertiesButton.set_sensitive(gtk.FALSE) - self.deleteButton.set_sensitive(gtk.FALSE) - self.propertiesMenu.set_sensitive(gtk.FALSE) - self.deleteMenu.set_sensitive(gtk.FALSE) + self.propertiesButton.set_sensitive(False) + self.deleteButton.set_sensitive(False) + self.propertiesMenu.set_sensitive(False) + self.deleteMenu.set_sensitive(False) def on_aboutButton_clicked(self, *args): if not self.__dict__.has_key ('aboutDialog'): @@ -256,7 +256,7 @@ class mainWindow: def on_aboutDialog_close (self, *args): self.aboutDialog.hide () self.aboutDialogShown = False - return gtk.TRUE + return True def aboutDialogPrepare (self): holders = [ --- system-config-nfs-1.3.5/src/propertiesWindow.py~ 2005-04-01 14:32:26.889868056 +1000 +++ system-config-nfs-1.3.5/src/propertiesWindow.py 2005-04-01 14:32:32.770973992 +1000 @@ -80,16 +80,16 @@ class propertiesWindow: self.xml.signal_connect ('on_browseButton_clicked', self.on_browseButton_clicked) # general options page self.xml.signal_connect ("on_syncCheckButton_toggled", self.on_syncCheckButton_toggled) - self.forceSyncCheckButton.set_sensitive(gtk.FALSE) + self.forceSyncCheckButton.set_sensitive(False) # user page self.xml.signal_connect ('on_noRootSquashCheckButton_toggled', self.on_noRootSquashCheckButton_toggled) self.xml.signal_connect ('on_userSquashCheckButton_toggled', self.on_userSquashCheckButton_toggled) - self.toggle_box(gtk.FALSE) + self.toggle_box(False) def on_cancelButton_clicked(self, *args): self.reset() - return gtk.TRUE + return True def on_browseButton_clicked(self, *args): dlg = gtk.FileSelection() @@ -114,9 +114,9 @@ class propertiesWindow: self.gidEntry.set_sensitive(state) def on_userSquashCheckButton_toggled(self, *args): - if self.userSquashCheckButton.get_active() == gtk.FALSE: - self.toggle_box(gtk.FALSE) - self.noRootSquashCheckButton.set_sensitive(gtk.TRUE) + if self.userSquashCheckButton.get_active() == False: + self.toggle_box(False) + self.noRootSquashCheckButton.set_sensitive(True) else: state = self.userSquashCheckButton.get_active() self.noRootSquashCheckButton.set_sensitive(not state) @@ -149,7 +149,7 @@ class propertiesWindow: (_("You must specify a directory and a host"))) dlg.set_position(gtk.WIN_POS_CENTER) dlg.set_icon(mainWindow.iconPixbuf) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.run() dlg.destroy() return @@ -169,7 +169,7 @@ class propertiesWindow: (_("You must specify a directory and a host"))) dlg.set_position(gtk.WIN_POS_CENTER) dlg.set_icon(mainWindow.iconPixbuf) - dlg.set_modal(gtk.TRUE) + dlg.set_modal(True) dlg.run() dlg.destroy() return @@ -182,7 +182,7 @@ class propertiesWindow: (_("%s is not a valid directory." % dir))) warn.set_position(gtk.WIN_POS_CENTER) warn.set_icon(mainWindow.iconPixbuf) - warn.set_modal(gtk.TRUE) + warn.set_modal(True) warn.run() warn.destroy() return @@ -225,22 +225,22 @@ class propertiesWindow: share.clients.append (client) newclients.append (client) - if self.readRadio.get_active() == gtk.TRUE: + if self.readRadio.get_active() == True: self.exportsStore.set_value(iter, 2, "Read") client.set ("ro") else: self.exportsStore.set_value(iter, 2, "Read/Write") client.set ("rw") - if self.inSecureCheckButton.get_active() == gtk.TRUE: + if self.inSecureCheckButton.get_active() == True: client.set ("insecure") else: client.set ("secure") - if self.syncCheckButton.get_active() == gtk.TRUE: + if self.syncCheckButton.get_active() == True: client.set ("sync") - if self.forceSyncCheckButton.get_active() == gtk.TRUE: + if self.forceSyncCheckButton.get_active() == True: client.set ("no_wdelay") else: client.set ("wdelay") @@ -249,22 +249,22 @@ class propertiesWindow: client.set ("async") client.set ("wdelay") - if self.subtreeCheckButton.get_active() == gtk.TRUE: + if self.subtreeCheckButton.get_active() == True: client.set ("no_subtree_check") else: client.set ("subtree_check") - if self.insecureLockCheckButton.get_active() == gtk.TRUE: + if self.insecureLockCheckButton.get_active() == True: client.set ("insecure_locks") else: client.set ("secure_locks") - if self.hideCheckButton.get_active () == gtk.TRUE: + if self.hideCheckButton.get_active () == True: client.set ("hide") else: client.set ("nohide") - if self.mpCheckButton.get_active () == gtk.TRUE: + if self.mpCheckButton.get_active () == True: if len (self.mpEntry.get_text ()) == 0: client.set ("mp") else: @@ -277,10 +277,10 @@ class propertiesWindow: else: client.set ("!fsid") - if self.noRootSquashCheckButton.get_active() == gtk.TRUE: + if self.noRootSquashCheckButton.get_active() == True: client.set ("no_root_squash") - elif self.userSquashCheckButton.get_active() == gtk.TRUE: + elif self.userSquashCheckButton.get_active() == True: client.set ("all_squash") if len (self.uidEntry.get_text ()): @@ -300,7 +300,7 @@ class propertiesWindow: def show_win(self, title, iter=None): self.dialog.set_title(title) - self.syncCheckButton.set_active(gtk.TRUE) + self.syncCheckButton.set_active(True) if iter: self.dirEntry.set_text(self.exportsStore.get_value(iter, 0)) @@ -310,41 +310,41 @@ class propertiesWindow: client = self.exportsStore.get_value(iter, 4)[0] if client.get ("ro"): - self.readRadio.set_active(gtk.TRUE) + self.readRadio.set_active(True) else: - self.writeRadio.set_active(gtk.TRUE) + self.writeRadio.set_active(True) if client.get ("insecure"): - self.inSecureCheckButton.set_active(gtk.TRUE) + self.inSecureCheckButton.set_active(True) if client.get ("sync"): - self.syncCheckButton.set_active(gtk.TRUE) + self.syncCheckButton.set_active(True) else: - self.syncCheckButton.set_active(gtk.FALSE) + self.syncCheckButton.set_active(False) if client.get ("no_wdelay"): - self.forceSyncCheckButton.set_active(gtk.TRUE) + self.forceSyncCheckButton.set_active(True) if client.get ("no_subtree_check"): - self.subtreeCheckButton.set_active(gtk.TRUE) + self.subtreeCheckButton.set_active(True) if client.get ("insecure_locks"): - self.insecureLockCheckButton.set_active(gtk.TRUE) + self.insecureLockCheckButton.set_active(True) if client.get ("hide"): - self.hideCheckButton.set_active (gtk.TRUE) + self.hideCheckButton.set_active (True) else: - self.hideCheckButton.set_active (gtk.FALSE) + self.hideCheckButton.set_active (False) mp = client.get ("mp") if mp != False: - self.mpCheckButton.set_active (gtk.TRUE) + self.mpCheckButton.set_active (True) if isinstance (mp, str): self.mpEntry.set_text (mp) else: self.mpEntry.set_text ('') else: - self.mpCheckButton.set_active (gtk.FALSE) + self.mpCheckButton.set_active (False) self.mpEntry.set_text ('') self.on_mpCheckButton_toggled () @@ -356,10 +356,10 @@ class propertiesWindow: self.fsidEntry.set_text ('') if client.get ("squash") == "no_root_squash": - self.noRootSquashCheckButton.set_active(gtk.TRUE) + self.noRootSquashCheckButton.set_active(True) elif client.get ("squash") == "all_squash": - self.userSquashCheckButton.set_active(gtk.TRUE) + self.userSquashCheckButton.set_active(True) if client.get ('anonuid'): self.uidEntry.set_text(client.get ('anonuid')) @@ -374,20 +374,20 @@ class propertiesWindow: self.notebook.set_current_page(0) self.dirEntry.set_text("") self.hostEntry.set_text("") - self.readRadio.set_active(gtk.TRUE) + self.readRadio.set_active(True) - self.inSecureCheckButton.set_active(gtk.FALSE) - self.insecureLockCheckButton.set_active(gtk.FALSE) - self.subtreeCheckButton.set_active(gtk.FALSE) - self.syncCheckButton.set_active(gtk.FALSE) - self.forceSyncCheckButton.set_active(gtk.FALSE) - self.hideCheckButton.set_active (gtk.TRUE) - self.mpCheckButton.set_active (gtk.FALSE) + self.inSecureCheckButton.set_active(False) + self.insecureLockCheckButton.set_active(False) + self.subtreeCheckButton.set_active(False) + self.syncCheckButton.set_active(False) + self.forceSyncCheckButton.set_active(False) + self.hideCheckButton.set_active (True) + self.mpCheckButton.set_active (False) self.mpEntry.set_text ("") self.fsidEntry.set_text ("") - self.noRootSquashCheckButton.set_active(gtk.FALSE) - self.userSquashCheckButton.set_active(gtk.FALSE) + self.noRootSquashCheckButton.set_active(False) + self.userSquashCheckButton.set_active(False) self.uidEntry.set_text("") self.gidEntry.set_text("")