diff options
-rwxr-xr-x | gui.py | 18 | ||||
-rw-r--r-- | htmlbuffer.py | 2 | ||||
-rw-r--r-- | iw/account_gui.py | 4 | ||||
-rw-r--r-- | iw/auth_gui.py | 8 | ||||
-rw-r--r-- | iw/bootloader_gui.py | 2 | ||||
-rw-r--r-- | iw/confirm_gui.py | 4 | ||||
-rw-r--r-- | iw/examine_gui.py | 2 | ||||
-rw-r--r-- | iw/fdisk_gui.py | 2 | ||||
-rw-r--r-- | iw/installpath_gui.py | 2 | ||||
-rw-r--r-- | iw/keyboard_gui.py | 2 | ||||
-rw-r--r-- | iw/language_gui.py | 2 | ||||
-rw-r--r-- | iw/language_support_gui.py | 6 | ||||
-rw-r--r-- | iw/mouse_gui.py | 2 | ||||
-rw-r--r-- | iw/network_gui.py | 8 | ||||
-rw-r--r-- | iw/package_gui.py | 2 | ||||
-rw-r--r-- | iw/partition_gui.py | 14 | ||||
-rw-r--r-- | iw/progress_gui.py | 4 | ||||
-rw-r--r-- | iw/silo_gui.py | 2 | ||||
-rw-r--r-- | iw/timezone_map_gui.py | 2 | ||||
-rw-r--r-- | iw/upgrade_migratefs_gui.py | 4 | ||||
-rw-r--r-- | iw/upgrade_swap_gui.py | 6 | ||||
-rw-r--r-- | iw/welcome_gui.py | 2 | ||||
-rw-r--r-- | iw/xconfig_gui.py | 8 | ||||
-rw-r--r-- | iw/zipl_gui.py | 2 |
24 files changed, 55 insertions, 55 deletions
@@ -124,9 +124,9 @@ def growToParent(widget, rect, growTo=None): if not ignore: if growTo: x, y, width, height = growTo.get_allocation() - widget.set_usize(width, -1) + widget.set_size_request(width, -1) else: - widget.set_usize(rect.width, -1) + widget.set_size_request(rect.width, -1) widget.ignoreEvents = 1 else: widget.ignoreEvents = 0 @@ -136,7 +136,7 @@ class WrappingLabel(gtk.Label): gtk.Label.__init__(self, label) self.set_line_wrap(gtk.TRUE) self.ignoreEvents = 0 - self.set_usize(-1, 1) + self.set_size_request(-1, 1) widgetExpander(self) class WaitWindow: @@ -218,12 +218,12 @@ class ExceptionWindow: "dump to a floppy then file a detailed bug " "report against anaconda at " "http://bugzilla.redhat.com/bugzilla/")) - info.set_usize (400, -1) + info.set_size_request (400, -1) hbox.pack_start (sw, gtk.TRUE) win.vbox.pack_start (info, gtk.FALSE) win.vbox.pack_start (hbox, gtk.TRUE) - win.set_usize (500, 300) + win.set_size_request (500, 300) win.set_position (gtk.WIN_POS_CENTER) win.show_all () self.window = win @@ -490,7 +490,7 @@ class InstallControlWindow: a.add (frame) self.textWin.set_default_size (635, 393) - self.textWin.set_usize (635, 393) + self.textWin.set_size_request (635, 393) self.textWin.set_position (gtk.WIN_POS_CENTER) table.attach (a, 1, 2, 1, 2, @@ -652,7 +652,7 @@ class InstallControlWindow: def abortInstall (self, *args): dlg = gtk.Dialog(_("Warning"), mainWindow) dlg.set_modal(gtk.TRUE) - dlg.set_usize(350, 200) + dlg.set_size_request(350, 200) dlg.set_position(gtk.WIN_POS_CENTER) dlg.set_border_width(5) dlg.add_button('gtk-yes', 0) @@ -717,10 +717,10 @@ class InstallControlWindow: if runres == '640x480': self.window.set_default_size (640, 480) - self.window.set_usize (640, 480) + self.window.set_size_request (640, 480) else: self.window.set_default_size (800, 600) - self.window.set_usize (800, 600) + self.window.set_size_request (800, 600) self.window.set_border_width (10) diff --git a/htmlbuffer.py b/htmlbuffer.py index 5233d1778..b06f168d6 100644 --- a/htmlbuffer.py +++ b/htmlbuffer.py @@ -164,6 +164,6 @@ if __name__ == '__main__': win.connect('destroy', quit) win.add(sw) win.show_all() - win.set_usize(300, 300) + win.set_size_request(300, 300) gtk.main() diff --git a/iw/account_gui.py b/iw/account_gui.py index 01584adab..855d6d610 100644 --- a/iw/account_gui.py +++ b/iw/account_gui.py @@ -190,7 +190,7 @@ class AccountWindow (InstallWindow): def userWindow (self, title, data=None): userWin = gtk.Dialog() userWin.set_modal(gtk.TRUE) - userWin.set_usize(350, 200) + userWin.set_size_request(350, 200) userWin.set_position (gtk.WIN_POS_CENTER) userWin.set_border_width(5) @@ -306,7 +306,7 @@ class AccountWindow (InstallWindow): label = gtk.Label (_("Enter the password for the root user " "(administrator) of this system.")) label.set_line_wrap(gtk.TRUE) - label.set_usize(350, -1) + label.set_size_request(350, -1) a = gtk.Alignment () a.add (label) diff --git a/iw/auth_gui.py b/iw/auth_gui.py index 27316dfbd..5659a4f6e 100644 --- a/iw/auth_gui.py +++ b/iw/auth_gui.py @@ -126,7 +126,7 @@ class AuthWindow (InstallWindow): nistable.attach (self.nis, 0, 10, 0, 1, gtk.FILL, gtk.SHRINK, 0.0, 0.5) spacer = gtk.Label("") - spacer.set_usize(10, 1) + spacer.set_size_request(10, 1) nistable.attach (spacer, 0, 1, 1, 2, gtk.SHRINK, gtk.SHRINK, 0.0, 0.5) nistable.attach (self.nisDomainLabel, 2, 3, 1, 2, gtk.FILL, gtk.SHRINK, 0.0, 0.5) @@ -155,7 +155,7 @@ class AuthWindow (InstallWindow): ldaptable.attach (self.ldap, 0, 10, 0, 1, gtk.FILL, gtk.SHRINK, 0.0, 0.5) spacer = gtk.Label("") - spacer.set_usize(10, 1) + spacer.set_size_request(10, 1) ldaptable.attach (spacer, 0, 1, 1, 2, gtk.SHRINK, gtk.SHRINK, 0.0, 0.5) ldaptable.attach (self.ldapServerLabel, 2, 3, 1, 2, gtk.FILL, gtk.SHRINK, 0.0, 0.5) ldaptable.attach (self.ldapServer, 3, 10, 1, 2, gtk.SHRINK, gtk.SHRINK, 0.0, 0.5) @@ -191,7 +191,7 @@ class AuthWindow (InstallWindow): krb5table.attach (self.krb5, 0, 10, 0, 1, gtk.FILL, gtk.SHRINK, 0.0, 0.5) spacer = gtk.Label("") - spacer.set_usize(10, 1) + spacer.set_size_request(10, 1) krb5table.attach (spacer, 0, 1, 1, 2, gtk.SHRINK, gtk.SHRINK, 0.0, 0.5) krb5table.attach (self.krb5RealmLabel, 2, 3, 1, 2, gtk.FILL, gtk.SHRINK, 0.0, 0.5) krb5table.attach (self.krb5Realm, 3, 10, 1, 2, gtk.SHRINK, gtk.SHRINK, 0.0, 0.5) @@ -223,7 +223,7 @@ class AuthWindow (InstallWindow): sambatable.attach (self.samba, 0, 10, 0, 1, gtk.FILL, gtk.SHRINK, 0.0, 0.5) spacer = gtk.Label("") - spacer.set_usize(10, 1) + spacer.set_size_request(10, 1) sambatable.attach (spacer, 0, 1, 1, 2, gtk.SHRINK, gtk.SHRINK, 0.0, 0.5) sambatable.attach (self.sambaLabel1, 2, 3, 1, 2, gtk.FILL, gtk.SHRINK, 0.0, 0.5) sambatable.attach (self.sambaServer, 3, 10, 1, 2, gtk.SHRINK, gtk.SHRINK, 0.0, 0.5) diff --git a/iw/bootloader_gui.py b/iw/bootloader_gui.py index 62f889b6c..b6f961d0e 100644 --- a/iw/bootloader_gui.py +++ b/iw/bootloader_gui.py @@ -299,7 +299,7 @@ class BootloaderWindow (InstallWindow): self.radioBox.set_border_width (5) spacer = gtk.Label("") - spacer.set_usize(10, 1) + spacer.set_size_request(10, 1) self.radioBox.attach(spacer, 0, 1, 2, 4, gtk.FALSE) label = gtk.Label(_("Install Boot Loader record on:")) diff --git a/iw/confirm_gui.py b/iw/confirm_gui.py index 7ce633f00..0c5a20229 100644 --- a/iw/confirm_gui.py +++ b/iw/confirm_gui.py @@ -33,11 +33,11 @@ class ConfirmWindow (InstallWindow): label = gtk.Label (labelText) label.set_line_wrap (gtk.TRUE) - label.set_usize(190, -1) + label.set_size_request(190, -1) label2 = gtk.Label (longText) label2.set_line_wrap (gtk.TRUE) - label2.set_usize(190, -1) + label2.set_size_request(190, -1) box.pack_start (label, gtk.FALSE) box.pack_start (label2, gtk.FALSE) diff --git a/iw/examine_gui.py b/iw/examine_gui.py index d89c93aa7..463d28ece 100644 --- a/iw/examine_gui.py +++ b/iw/examine_gui.py @@ -67,7 +67,7 @@ class UpgradeExamineWindow (InstallWindow): box.pack_start (table, gtk.FALSE) box.pack_start (gtk.HSeparator ()) spacer = gtk.Label("") - spacer.set_usize(15, 1) + spacer.set_size_request(15, 1) table.attach(spacer, 0, 1, 2, 4, gtk.FALSE) self.ics.setNextEnabled (gtk.TRUE) diff --git a/iw/fdisk_gui.py b/iw/fdisk_gui.py index bfbd4877b..99e83703f 100644 --- a/iw/fdisk_gui.py +++ b/iw/fdisk_gui.py @@ -109,7 +109,7 @@ class FDiskWindow (InstallWindow): sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) viewport = sw.children()[0] viewport.set_shadow_type(gtk.SHADOW_ETCHED_IN) - sw.set_usize(-1, 400) + sw.set_size_request(-1, 400) self.buttonBox.pack_start (label, gtk.FALSE) self.buttonBox.pack_start (sw, gtk.FALSE) diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py index 33235efc9..436394ffe 100644 --- a/iw/installpath_gui.py +++ b/iw/installpath_gui.py @@ -132,7 +132,7 @@ class InstallPathWindow (InstallWindow): _(parentName), parentPixmap) box = gtk.VBox (gtk.FALSE, 0) - box.set_usize(300, -1) + box.set_size_request(300, -1) group = None for obj in topButtons[item]: diff --git a/iw/keyboard_gui.py b/iw/keyboard_gui.py index ee22686d4..8e0506ca4 100644 --- a/iw/keyboard_gui.py +++ b/iw/keyboard_gui.py @@ -106,7 +106,7 @@ class KeyboardWindow (InstallWindow): label = gtk.Label(_("Which model keyboard is attached to the computer?")) label.set_line_wrap(gtk.TRUE) - label.set_usize(350, -1) + label.set_size_request(350, -1) hbox.pack_start(label, gtk.FALSE) box.pack_start(hbox, gtk.FALSE) diff --git a/iw/language_gui.py b/iw/language_gui.py index 3c0cd91e8..5cf8f85f7 100644 --- a/iw/language_gui.py +++ b/iw/language_gui.py @@ -61,7 +61,7 @@ class LanguageWindow (InstallWindow): label = gtk.Label (_("What language would you like to use during the " "installation process?")) label.set_line_wrap (gtk.TRUE) - label.set_usize(350, -1) + label.set_size_request(350, -1) hbox.pack_start(label, gtk.FALSE) self.instLang = instLang diff --git a/iw/language_support_gui.py b/iw/language_support_gui.py index 610c2cd73..a4d3df511 100644 --- a/iw/language_support_gui.py +++ b/iw/language_support_gui.py @@ -127,7 +127,7 @@ class LanguageSupportWindow (InstallWindow): label.set_alignment (0.0, 0.5) label.set_line_wrap (gtk.TRUE) - label.set_usize(400, -1) + label.set_size_request(400, -1) vbox.pack_start (label, gtk.FALSE) hbox = gtk.HBox (gtk.FALSE) @@ -170,13 +170,13 @@ class LanguageSupportWindow (InstallWindow): vbox2 = gtk.VBox (gtk.FALSE, 12) all_button = gtk.Button (_("Select all")) - all_button.set_usize(160, -1) + all_button.set_size_request(160, -1) all_button.connect ('clicked', self.select_all) a1 = gtk.Alignment (0.5, 0.5) a1.add (all_button) reset_button = gtk.Button (_("Reset")) - reset_button.set_usize(160, -1) + reset_button.set_size_request(160, -1) reset_button.connect ('clicked', self.reset) a2 = gtk.Alignment (0.5, 0.5) a2.add (reset_button) diff --git a/iw/mouse_gui.py b/iw/mouse_gui.py index a37b48029..86adddbe4 100644 --- a/iw/mouse_gui.py +++ b/iw/mouse_gui.py @@ -235,7 +235,7 @@ class MouseWindow(InstallWindow): hbox.pack_start(a, gtk.FALSE) label = gtk.Label(_("Which model mouse is attached to the computer?")) label.set_line_wrap(gtk.TRUE) - label.set_usize(350, -1) + label.set_size_request(350, -1) hbox.pack_start(label, gtk.FALSE) box.pack_start(hbox, gtk.FALSE) diff --git a/iw/network_gui.py b/iw/network_gui.py index 10a71225e..1e9cc6bb5 100644 --- a/iw/network_gui.py +++ b/iw/network_gui.py @@ -219,8 +219,8 @@ class NetworkWindow(InstallWindow): label.set_alignment(0.0, 0.5) ipTable.attach(label, 0, 1, t, t+1, gtk.FILL, 0, 10) entry = gtk.Entry(15) - # entry.set_usize(gdk_char_width(entry.get_style().font, '0')*15, -1) - entry.set_usize(7 * 15, -1) + # entry.set_size_request(gdk_char_width(entry.get_style().font, '0')*15, -1) + entry.set_size_request(7 * 15, -1) entry.connect("activate", forward) entry.set_text(devs[i].get(options[t][1])) @@ -262,10 +262,10 @@ class NetworkWindow(InstallWindow): self.ipTable.attach(label, 0, 1, i, i+1, gtk.FILL, 0, 10) if i == 0: options[i] = gtk.Entry() - options[i].set_usize(7 * 30, -1) + options[i].set_size_request(7 * 30, -1) else: options[i] = gtk.Entry(15) - options[i].set_usize(7 * 15, -1) + options[i].set_size_request(7 * 15, -1) options[i].connect("activate", forward) align = gtk.Alignment(0, 0.5) align.add(options[i]) diff --git a/iw/package_gui.py b/iw/package_gui.py index 432b560a1..636fd4781 100644 --- a/iw/package_gui.py +++ b/iw/package_gui.py @@ -385,7 +385,7 @@ class IndividualPackageSelectionWindow (InstallWindow): self.packageDesc.set_cursor_visible(gtk.FALSE) self.packageDesc.set_wrap_mode(gtk.TRUE) descSW.add (self.packageDesc) - descSW.set_usize (-1, 100) + descSW.set_size_request (-1, 100) descVBox.pack_start (descSW) diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 373be5871..0e6e2a3eb 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -474,7 +474,7 @@ def fstypechangeCB(widget, mountCombo): def createAllowedDrivesClist(disks, reqdrives): driveclist = gtk.CList() driveclist.set_selection_mode(gtk.SELECTION_MULTIPLE) - driveclist.set_usize(-1, 75) + driveclist.set_size_request(-1, 75) driverow = 0 drives = disks.keys() @@ -498,7 +498,7 @@ def createAllowedRaidPartitionsClist(allraidparts, reqraidpart): partclist = gtk.CList() partclist.set_selection_mode(gtk.SELECTION_MULTIPLE) - partclist.set_usize(-1, 95) + partclist.set_size_request(-1, 95) sw = gtk.ScrolledWindow() sw.add(partclist) sw.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC) @@ -652,11 +652,11 @@ class PartitionWindow(InstallWindow): info1 = gtk.Label(labelstr1) info1.set_line_wrap(gtk.TRUE) -# info1.set_usize(300, -1) +# info1.set_size_request(300, -1) info2 = gtk.Label(labelstr2) info2.set_line_wrap(gtk.TRUE) -# info2.set_usize(300, -1) +# info2.set_size_request(300, -1) vbox = gtk.VBox(gtk.FALSE) vbox.pack_start(info1, gtk.FALSE) @@ -665,7 +665,7 @@ class PartitionWindow(InstallWindow): hbox.pack_start(vbox, gtk.FALSE) win.vbox.pack_start(hbox) -# win.set_usize(400,300) +# win.set_size_request(400,300) win.set_position(gtk.WIN_POS_CENTER) win.show_all() rc = win.run() @@ -1137,7 +1137,7 @@ class PartitionWindow(InstallWindow): "on this partition?")) label.set_line_wrap(1) label.set_alignment(0.0, 0.0) -# label.set_usize(400, -1) +# label.set_size_request(400, -1) maintable.attach(label, 0, 2, row, row + 1) row = row + 1 @@ -1809,7 +1809,7 @@ class AutoPartitionWindow(InstallWindow): self.driveclist = createAllowedDrivesClist(diskset.disks, cleardrives) # XXX bad use of usize - self.driveclist.set_usize(300, 80) + self.driveclist.set_size_request(300, 80) sw = gtk.ScrolledWindow() sw.add(self.driveclist) diff --git a/iw/progress_gui.py b/iw/progress_gui.py index 05b9bee18..23edb0842 100644 --- a/iw/progress_gui.py +++ b/iw/progress_gui.py @@ -215,8 +215,8 @@ class InstallProgressWindow (InstallWindow): label.set_line_wrap (gtk.TRUE) if key == "summary": label.set_text ("\n\n") - label.set_usize(450, 35) -# label.set_usize(-1, 1) + label.set_size_request(450, 35) +# label.set_size_request(-1, 1) self.curPackage[key] = label table.attach (label, 1, 2, i, i+1, gtk.FILL, fillopts) i = i + 1 diff --git a/iw/silo_gui.py b/iw/silo_gui.py index 583f1180d..10b88e022 100644 --- a/iw/silo_gui.py +++ b/iw/silo_gui.py @@ -166,7 +166,7 @@ class SiloWindow (InstallWindow): self.radioBox.set_border_width (5) spacer = GtkLabel("") - spacer.set_usize(10, 1) + spacer.set_size_request(10, 1) self.radioBox.attach(spacer, 0, 1, 2, 4, FALSE) label = GtkLabel(_("Install SILO boot record on:")) diff --git a/iw/timezone_map_gui.py b/iw/timezone_map_gui.py index b43109680..f4988dcd4 100644 --- a/iw/timezone_map_gui.py +++ b/iw/timezone_map_gui.py @@ -45,7 +45,7 @@ class TimezoneMap(gtk.VBox): root.add(gnome.canvas.CanvasPixbuf, x=0, y=0, pixbuf=pixbuf) x1, y1, x2, y2 = root.get_bounds() self.canvas.set_scroll_region(x1, y1, x2, y2) - self.canvas.set_usize(x2, y2) + self.canvas.set_size_request(x2, y2) self.pack_start(self.canvas, gtk.FALSE, gtk.FALSE) self.current = root.add(gnome.canvas.CanvasText, text='x', diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py index 309e59951..3192df15f 100644 --- a/iw/upgrade_migratefs_gui.py +++ b/iw/upgrade_migratefs_gui.py @@ -59,7 +59,7 @@ class UpgradeMigrateFSWindow (InstallWindow): label = GtkLabel (_(text)) label.set_alignment (0.5, 0.0) - label.set_usize(400, -1) + label.set_size_request(400, -1) label.set_line_wrap (TRUE) box.pack_start(label, FALSE) @@ -82,7 +82,7 @@ class UpgradeMigrateFSWindow (InstallWindow): sw = GtkScrolledWindow() sw.set_policy(POLICY_NEVER, POLICY_AUTOMATIC) sw.add_with_viewport(cbox) - sw.set_usize(-1, 175) + sw.set_size_request(-1, 175) viewport = sw.children()[0] viewport.set_shadow_type(SHADOW_ETCHED_IN) diff --git a/iw/upgrade_swap_gui.py b/iw/upgrade_swap_gui.py index 04001ed41..e0d58d4c1 100644 --- a/iw/upgrade_swap_gui.py +++ b/iw/upgrade_swap_gui.py @@ -97,7 +97,7 @@ class UpgradeSwapWindow (InstallWindow): (iutil.memInstalled(corrected = 1)/1024)) label.set_alignment (0.5, 0.0) - label.set_usize(400, 100) + label.set_size_request(400, 100) label.set_line_wrap (TRUE) box.pack_start(label, FALSE) @@ -137,7 +137,7 @@ class UpgradeSwapWindow (InstallWindow): label = GtkLabel (_("It is recommended that your swap file be at " "least %d MB. Please enter a size for the swap " "file:") % suggSize) - label.set_usize(400, 40) + label.set_size_request(400, 40) label.set_line_wrap (TRUE) a = GtkAlignment(0.5, 0.5) a.add(label) @@ -153,7 +153,7 @@ class UpgradeSwapWindow (InstallWindow): hbox.pack_start(label, FALSE) self.entry = GtkEntry(4) - self.entry.set_usize(40, 25) + self.entry.set_size_request(40, 25) self.entry.set_text(str(suggSize)) hbox.pack_start(self.entry, FALSE, TRUE, 10) diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py index f57c2392c..aa8cb4a98 100644 --- a/iw/welcome_gui.py +++ b/iw/welcome_gui.py @@ -84,7 +84,7 @@ class ReconfigWelcomeWindow (InstallWindow): label = gtk.Label(_("Would you like to configure your system?")) label.set_line_wrap(gtk.TRUE) label.set_alignment(0.0, 0.0) - label.set_usize(400, -1) + label.set_size_request(400, -1) box.pack_start(label) diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index af0a97f9f..7fa7ea35d 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -613,8 +613,8 @@ class MonitorWindow (InstallWindow): vlabel = gtk.Label (_("Vertical Sync:")) vlabel.set_alignment (0, 0.5) - self.hEntry.set_usize (80, 0) - self.vEntry.set_usize (80, 0) + self.hEntry.set_size_request (80, 0) + self.vEntry.set_size_request (80, 0) hz = gtk.Label (_("kHz")) hz.set_alignment (0, 0.5) @@ -794,7 +794,7 @@ class XConfigWindow (InstallWindow): label.set_justify (gtk.JUSTIFY_LEFT) label.set_line_wrap (gtk.TRUE) label.set_alignment (0.0, 0.5) - label.set_usize (400, -1) + label.set_size_request (400, -1) return label self.dispatch = dispatch @@ -912,7 +912,7 @@ class XConfigWindow (InstallWindow): label = gtk.Label (_("Video card RAM: ")) self.ramOption = gtk.OptionMenu() - self.ramOption.set_usize (40, 20) + self.ramOption.set_size_request (40, 20) self.ramMenu = gtk.Menu() for mem in self.videocard.possible_ram_sizes(): diff --git a/iw/zipl_gui.py b/iw/zipl_gui.py index 0710aa774..d6dfba768 100644 --- a/iw/zipl_gui.py +++ b/iw/zipl_gui.py @@ -91,7 +91,7 @@ class ZiplWindow (InstallWindow): "\n" "You can now enter any additional kernel parameters " "which your machine or your setup may require.")) - label.set_usize(500, -1) + label.set_size_request(500, -1) label.set_line_wrap(TRUE) label.set_alignment(0.0, 0.0) label.set_padding(50,50) |