FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu Kernel Team

 
 
LinkBack Thread Tools
 
Old 06-06-2011, 03:01 PM
David Cantrell
 
Default Fix the filter UI to sort capacity as numbers, not characters (#614504).

Looks good, with the following suggestions...

Chris Lumens <clumens@redhat.com> wrote:

> ---
> pyanaconda/iw/filter_gui.py | 18 +++++++++---------
> 1 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/pyanaconda/iw/filter_gui.py b/pyanaconda/iw/filter_gui.py
> index 69098c3..d3d654d 100644
> --- a/pyanaconda/iw/filter_gui.py
> +++ b/pyanaconda/iw/filter_gui.py
> @@ -488,7 +488,7 @@ class FilterWindow(InstallWindow):
> np = NotebookPage(self.store, "basic", self.xml, Callbacks(self.xml))
>
> np.ds.addColumn(_("Model"), MODEL_COL)
> - np.ds.addColumn(_("Capacity"), CAPACITY_COL)
> + np.ds.addColumn(_("Capacity (MB)"), CAPACITY_COL)
> np.ds.addColumn(_("Vendor"), VENDOR_COL)
> np.ds.addColumn(_("Interconnect"), INTERCONNECT_COL)
> np.ds.addColumn(_("Serial Number"), SERIAL_COL)
> @@ -499,7 +499,7 @@ class FilterWindow(InstallWindow):
> np = NotebookPage(self.store, "raid", self.xml, RAIDCallbacks(self.xml))
>
> np.ds.addColumn(_("Model"), MODEL_COL)
> - np.ds.addColumn(_("Capacity"), CAPACITY_COL)
> + np.ds.addColumn(_("Capacity (MB)"), CAPACITY_COL)
> np.ds.addColumn(_("Device"), DEVICE_COL, displayed=False)
> return np
>
> @@ -507,7 +507,7 @@ class FilterWindow(InstallWindow):
> np = NotebookPage(self.store, "mpath", self.xml, MPathCallbacks(self.xml))
>
> np.ds.addColumn(_("Identifier"), ID_COL)
> - np.ds.addColumn(_("Capacity"), CAPACITY_COL)
> + np.ds.addColumn(_("Capacity (MB)"), CAPACITY_COL)
> np.ds.addColumn(_("Vendor"), VENDOR_COL)
> np.ds.addColumn(_("Interconnect"), INTERCONNECT_COL)
> np.ds.addColumn(_("Paths"), MEMBERS_COL)
> @@ -518,7 +518,7 @@ class FilterWindow(InstallWindow):
> np = NotebookPage(self.store, "other", self.xml, OtherCallbacks(self.xml))
>
> np.ds.addColumn(_("Identifier"), ID_COL)
> - np.ds.addColumn(_("Capacity"), CAPACITY_COL)
> + np.ds.addColumn(_("Capacity (MB)"), CAPACITY_COL)
> np.ds.addColumn(_("Vendor"), VENDOR_COL)
> np.ds.addColumn(_("Interconnect"), INTERCONNECT_COL)
> np.ds.addColumn(_("Serial Number"), SERIAL_COL, displayed=False)
> @@ -529,7 +529,7 @@ class FilterWindow(InstallWindow):
> np = NotebookPage(self.store, "search", self.xml, SearchCallbacks(self.xml))
>
> np.ds.addColumn(_("Model"), MODEL_COL)
> - np.ds.addColumn(_("Capacity"), CAPACITY_COL, displayed=False)
> + np.ds.addColumn(_("Capacity (MB)"), CAPACITY_COL, displayed=False)
> np.ds.addColumn(_("Vendor"), VENDOR_COL)
> np.ds.addColumn(_("Interconnect"), INTERCONNECT_COL, displayed=False)
> np.ds.addColumn(_("Serial Number"), SERIAL_COL, displayed=False)
> @@ -578,7 +578,7 @@ class FilterWindow(InstallWindow):
> gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN,
> gobject.TYPE_BOOLEAN,
> gobject.TYPE_STRING, gobject.TYPE_STRING,
> - gobject.TYPE_STRING, gobject.TYPE_STRING,
> + gobject.TYPE_INT, gobject.TYPE_STRING,

gobject.TYPE_ULONG instead? According to PyGTK+ docs, that maps to a
Python long.

> gobject.TYPE_STRING, gobject.TYPE_STRING,
> gobject.TYPE_STRING, gobject.TYPE_STRING,
> gobject.TYPE_STRING, gobject.TYPE_STRING,
> @@ -716,7 +716,7 @@ class FilterWindow(InstallWindow):
> ident = udev_device_get_wwid(d)
>
> tuple = (d, True, _active(d), _isProtected(d), name,
> - partedDevice.model, str(d["XXX_SIZE"]) + " MB",
> + partedDevice.model, int(d["XXX_SIZE"]),

long() in place of int()?

> udev_device_get_vendor(d), udev_device_get_bus(d),
> udev_device_get_serial(d), ident, "", "", "", "")
> _addTuple(tuple)
> @@ -754,7 +754,7 @@ class FilterWindow(InstallWindow):
>
> model = "BIOS RAID set (%s)" % rs.rs.set_type
> tuple = (data, True, _active(data), _isProtected(data), rs.name,
> - model, str(size) + " MB", "", "", "", "",
> + model, int(size), "", "", "", "",
> "
".join(members), "", "", "")
> _addTuple(tuple)
>
> @@ -785,7 +785,7 @@ class FilterWindow(InstallWindow):
> data["name"] = udev_device_get_multipath_name(mpath[0])
> tuple = (data, True, _active(data), _isProtected(data),
> udev_device_get_multipath_name(mpath[0]), model,
> - str(mpath[0]["XXX_SIZE"]) + " MB",
> + int(mpath[0]["XXX_SIZE"]),
> udev_device_get_vendor(mpath[0]),
> udev_device_get_bus(mpath[0]),
> udev_device_get_serial(mpath[0]),
> --
> 1.7.4.1

--
David Cantrell <dcantrell@redhat.com>
Supervisor, Installer Engineering Team
Red Hat, Inc. | Westford, MA | EST5EDT

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 05:52 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org